From 42d572cd03ea11a059f5eb042f05ab06d58898dd Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 6 Jan 2023 08:31:54 -0600 Subject: [PATCH 1/2] set-df-path: accept path on command line --- build/win32/set_df_path.vbs | 15 +++++++++++---- build/win64/set_df_path.vbs | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/build/win32/set_df_path.vbs b/build/win32/set_df_path.vbs index 219d150da..0da7203b5 100644 --- a/build/win32/set_df_path.vbs +++ b/build/win32/set_df_path.vbs @@ -2,11 +2,18 @@ Option Explicit Const BIF_returnonlyfsdirs = &H0001 -Dim wsh, objDlg, objF, fso, spoFile -Set objDlg = WScript.CreateObject("Shell.Application") -Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs) +Dim wsh, objDlg, objF, fso, spoFile, args Set fso = CreateObject("Scripting.FileSystemObject") + +set args = Wscript.Arguments +if args.count > 0 Then + Set ObjF = fso.GetFolder(args.Item(0)) +else + Set objDlg = WScript.CreateObject("Shell.Application") + Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs).Self +end if + If fso.FileExists("DF_PATH.txt") Then fso.DeleteFile "DF_PATH.txt", True End If @@ -14,7 +21,7 @@ End If If IsValue(objF) Then If InStr(1, TypeName(objF), "Folder") > 0 Then Set spoFile = fso.CreateTextFile("DF_PATH.txt", True) - spoFile.WriteLine(objF.Self.Path) + spoFile.WriteLine(objF.Path) End If End If diff --git a/build/win64/set_df_path.vbs b/build/win64/set_df_path.vbs index 219d150da..0da7203b5 100644 --- a/build/win64/set_df_path.vbs +++ b/build/win64/set_df_path.vbs @@ -2,11 +2,18 @@ Option Explicit Const BIF_returnonlyfsdirs = &H0001 -Dim wsh, objDlg, objF, fso, spoFile -Set objDlg = WScript.CreateObject("Shell.Application") -Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs) +Dim wsh, objDlg, objF, fso, spoFile, args Set fso = CreateObject("Scripting.FileSystemObject") + +set args = Wscript.Arguments +if args.count > 0 Then + Set ObjF = fso.GetFolder(args.Item(0)) +else + Set objDlg = WScript.CreateObject("Shell.Application") + Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs).Self +end if + If fso.FileExists("DF_PATH.txt") Then fso.DeleteFile "DF_PATH.txt", True End If @@ -14,7 +21,7 @@ End If If IsValue(objF) Then If InStr(1, TypeName(objF), "Folder") > 0 Then Set spoFile = fso.CreateTextFile("DF_PATH.txt", True) - spoFile.WriteLine(objF.Self.Path) + spoFile.WriteLine(objF.Path) End If End If From 83e5bc120a2446984f97c0d57c89a442a22368c4 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 6 Jan 2023 12:01:01 -0600 Subject: [PATCH 2/2] set_df_path: handle cancel correctly --- build/win32/set_df_path.vbs | 5 ++++- build/win64/set_df_path.vbs | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/win32/set_df_path.vbs b/build/win32/set_df_path.vbs index 0da7203b5..85aeba2ce 100644 --- a/build/win32/set_df_path.vbs +++ b/build/win32/set_df_path.vbs @@ -11,7 +11,10 @@ if args.count > 0 Then Set ObjF = fso.GetFolder(args.Item(0)) else Set objDlg = WScript.CreateObject("Shell.Application") - Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs).Self + Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs) + if IsValue(objF) Then + set ObjF = objF.self + end if end if If fso.FileExists("DF_PATH.txt") Then diff --git a/build/win64/set_df_path.vbs b/build/win64/set_df_path.vbs index 0da7203b5..85aeba2ce 100644 --- a/build/win64/set_df_path.vbs +++ b/build/win64/set_df_path.vbs @@ -11,7 +11,10 @@ if args.count > 0 Then Set ObjF = fso.GetFolder(args.Item(0)) else Set objDlg = WScript.CreateObject("Shell.Application") - Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs).Self + Set objF = objDlg.BrowseForFolder (&H0,"Select your DF folder", BIF_returnonlyfsdirs) + if IsValue(objF) Then + set ObjF = objF.self + end if end if If fso.FileExists("DF_PATH.txt") Then