ovpn changes

diff --git a/app_v3/chrome/content/js/system.js b/app_v3/chrome/content/js/system.js
index b681b8f..f3003f2 100644 (file)
--- a/app_v3/chrome/content/js/system.js
+++ b/app_v3/chrome/content/js/system.js
@@ -332,7 +332,7 @@ var system = {
                  if (system.os == "Darwin" && system.fileexists(system.toolsdir() + system.sep() + "vpnclose.sh")){
                          system.runcmdline("/bin/bash",[system.toolsdir() + system.sep() + "vpnclose.sh",system.profilerootdir() + system.sep() + 'vpncfg.txt']);
                  } else {
-                         system.runcmdline(system.toolsdir() + system.sep() + "openvpn.exe",["--disconnect"],null);
+                         system.runcmdline(system.toolsdir() + system.sep() + "ovpn.exe",["--disconnect"],null);
                  }
          }
          

diff --git a/install/create_setup_windows.pl b/install/create_setup_windows.pl
index 0ed04f4..8f06f3c 100644 (file)
--- a/install/create_setup_windows.pl
+++ b/install/create_setup_windows.pl
@@ -180,7 +180,7 @@ close(APP);
 
 make_path("C:\\Users\\ksaff\\Release\\dist\\Tools");
 chdir("C:\\Users\\ksaff\\Release\\tag\\Tools");
-system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\ovpn.exe" ovpn.pl');
+system('"C:\\Strawberry\\perl\\site\\bin\\pp" -g -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\ovpn.exe" ovpn.pl');
 if (($setup eq "director")){
 #  open(CHKS,">C:\\Users\\ksaff\\Release\\dist\\checkschema.txt");
 #  close(CHKS);

diff --git a/install/windows/creorga_setup_director.iss b/install/windows/creorga_setup_director.iss
index 2af2d1b..2dab8a9 100644 (file)
--- a/install/windows/creorga_setup_director.iss
+++ b/install/windows/creorga_setup_director.iss
@@ -47,7 +47,7 @@ Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Flags:
 Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
 Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
 Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion 
+;Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion 
 ;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files