Merge branch 'main' of https://github.com/marticliment/WingetUI

Author: marticliment

WingetUI.iss

@@ -14,18 +14,19 @@ UninstallDisplayName="WingetUI"
 AppId={{889610CC-4337-4BDB-AC3B-4F21806C0BDD}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
+AppPublisherURL='https://www.marticliment.com/'
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 VersionInfoVersion=2.0.3.0
 DefaultDirName="{commonpf64}\WingetUI"
 DisableProgramGroupPage=yes
 DisableDirPage=no
+DirExistsWarning=no
 CloseApplications=no
 ; Remove the following line to run in administrative install mode (install for all users.)
-PrivilegesRequired=lowest
+;PrivilegesRequired=lowest
 OutputBaseFilename=WingetUI Installer
 OutputDir=.     
 MinVersion=10.0
@@ -37,7 +38,10 @@ WizardStyle=classic
 WizardImageFile=INSTALLER.BMP
 WizardSmallImageFile=wingetui\resources\icon.bmp
 DisableWelcomePage=no
-UsePreviousTasks=yes
+AllowUNCPath=no
+UsePreviousTasks=yes  
+UsePreviousPrivileges=no
+UsePreviousAppDir=no
 ChangesEnvironment=yes
 RestartIfNeededByRun=no
 Uninstallable=IsTaskSelected('regularinstall')
@@ -70,19 +74,42 @@ Name: "Ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 Name: "Korean"; MessagesFile: "compiler:Languages\Korean.isl"
 
 [InstallDelete]
-Type: filesandordirs; Name: "{autopf}\WingetUI\*.pyc"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
-Type: filesandordirs; Name: "{autopf}\WingetUI\PySide6\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
-Type: filesandordirs; Name: "{autopf}\WingetUI\pip-23.0.dist-info";
-Type: filesandordirs; Name: "{autopf}\WingetUI\pip-23.1.2.dist-info";
-Type: filesandordirs; Name: "{autopf}\WingetUI\setuptools-65.5.0.dist-info";   
-Type: filesandordirs; Name: "{autopf}\WingetUI\sudo";
-Type: filesandordirs; Name: "{autopf}\WingetUI\*.pyc";
-Type: filesandordirs; Name: "{autopf}\WingetUI\winget-cli\*";      
-Type: filesandordirs; Name: "{autopf}\WingetUI\resources\*";     
+Type: filesandordirs; Name: "{userpf}\WingetUI\*.pyc"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
+Type: filesandordirs; Name: "{userpf}\WingetUI\PySide6\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
+Type: filesandordirs; Name: "{userpf}\WingetUI\clr_loader\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\components\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\data\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\lang\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\markupsafe\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\PackageManagers\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\PySide6\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\pythonnet\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\pywin32_system32\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\shiboken6\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\winsdk\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\pip-23.1.2.dist-info";
+Type: filesandordirs; Name: "{userpf}\WingetUI\setuptools-65.5.0.dist-info";   
+Type: filesandordirs; Name: "{userpf}\WingetUI\sudo\*";
+Type: filesandordirs; Name: "{userpf}\WingetUI\winget-cli\*";      
+Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*";   
+Type: filesandordirs; Name: "{userpf}\WingetUI\resources\*.pyd";  
+Type: filesandordirs; Name: "{userpf}\WingetUI\resources\api-ms-win*.dll";  
+Type: filesandordirs; Name: "{userpf}\WingetUI\resources\python*.dll";  
+Type: filesandordirs; Name: "{userpf}\WingetUI\resources\wingetui.exe";  
+Type: filesandordirs; Name: "{app}\*.pyc"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
+Type: filesandordirs; Name: "{app}\PySide6\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');  
+Type: filesandordirs; Name: "{app}\pip-23.0.dist-info";
+Type: filesandordirs; Name: "{app}\pip-23.1.2.dist-info";
+Type: filesandordirs; Name: "{app}\setuptools-65.5.0.dist-info";   
+Type: filesandordirs; Name: "{app}\sudo";
+Type: filesandordirs; Name: "{app}\winget-cli\*";      
+Type: filesandordirs; Name: "{app}\resources\*";     
 Type: filesandordirs; Name: "{username}\WingetUI\resources\*";
 
 [UninstallDelete]
-Type: filesandordirs; Name: "{autopf}\WingetUI\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');
+Type: filesandordirs; Name: "{userpf}\WingetUI\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');   
+Type: filesandordirs; Name: "{app}\*"; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');
 
 [Code]
 procedure InitializeWizard;
@@ -161,6 +188,36 @@ begin
     end;
 end;
 
+function IsCharValid(Value: Char): Boolean;
+begin
+  Result := Ord(Value) <= $007F;
+end;
+
+function IsDirNameValid(const Value: string): Boolean;
+var
+  I: Integer;
+begin
+  Result := False;
+  for I := 1 to Length(Value) do
+    if not IsCharValid(Value[I]) then
+      Exit;
+  Result := True;
+end;
+
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+  Result := True;
+
+  if (CurPageID = wpSelectDir) and 
+    not IsDirNameValid(WizardForm.DirEdit.Text) then
+  begin
+    Result := False;
+    MsgBox('There is an invalid character in the selected install location. ' +
+      'Install location cannot contain special characters. ' +
+      'Please input a valid path to continue, such as '+ExpandConstant('{commonpf64}')+'\WingetUI', mbError, MB_OK);
+  end;
+end;
+
 
 [Tasks]
 Name: "portableinstall"; Description: "Perform a portable installation"; GroupDescription: "Installation type"; Flags: unchecked exclusive
@@ -174,13 +231,15 @@ Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType:
 [Files]
 Source: "Y:\WinGetUI-Store\wingetuiBin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; BeforeInstall: TripleKill('WingetUI.exe', 'winget.exe', 'choco.exe');
 Source: "Y:\WinGetUI-Store\wingetuiBin\*"; DestDir: "{app}"; Flags: createallsubdirs ignoreversion recursesubdirs;
+Source: "Y:\WinGetUI-Store\wingetuiBin\choco-cli\*"; DestDir: "{userpf}\WingetUI\choco-cli"; Flags: createallsubdirs ignoreversion recursesubdirs; Tasks: regularinstall
+
 ; MSVC++ redistributable runtime. Extracted by VC2017RedistNeedsInstall(), if needed.
 Source: "Y:\WinGetUI-Store\vcredist.exe"; DestDir: {tmp}; Flags: dontcopy
 Source: "Y:\WinGetUI-Store\SegUIVar.ttf"; DestDir: "{autofonts}"; FontInstall: "Segoe UI Variable"; Flags: onlyifdoesntexist uninsneveruninstall
 
 [Icons]
-Name: "{autostartmenu}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\startmenuicon
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\desktopicon
+Name: "{userstartmenu}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\startmenuicon
+Name: "{userdesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: regularinstall\desktopicon
 
 [Run]
 Filename: "{tmp}\vcredist.exe"; Flags: runhidden; Parameters: "/install /norestart /passive"; StatusMsg: "Installing Microsoft Visual C++ Redistributables (x64)"; Check: VCRedistNeedsInstall and not CmdLineParamExists('/NoVCRedist');

wingetui/PackageManagers/choco.py

@@ -15,9 +15,16 @@
 class ChocoPackageManager(SamplePackageManager):
 
     if getSettings("UseSystemChocolatey"):
+        print("🟡 System chocolatey used")
         EXECUTABLE = "choco.exe"
     else:
-        EXECUTABLE = os.path.join(os.path.join(realpath, "choco-cli"), "choco.exe")
+        possiblePath =  os.path.join(os.path.expanduser("~"), "AppData/Local/Programs/WingetUI/choco-cli/choco.exe")
+        if os.path.isfile(possiblePath):
+            print("🔵 Found default chocolatey installation on expected location")
+            EXECUTABLE = possiblePath
+        else:
+            print("🟡 Chocolatey was not found on the default location, perhaps a portable WingetUI installation?")
+            EXECUTABLE = os.path.join(os.path.join(realpath, "choco-cli"), "choco.exe")
         os.environ["chocolateyinstall"] = os.path.dirname(EXECUTABLE)
 
     icon = None

wingetui/__init__.py

@@ -5,7 +5,7 @@
     import faulthandler
     faulthandler.enable()
 
-pathIsValid = False
+pathIsValid = True
 specialCharacter = ""
 for char in sys.executable:
     if char not in "\\/:abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSRTUVWXYZ1234567890_+()-., ":
@@ -14,7 +14,7 @@
         break
 if not pathIsValid:
     import win32api
-    win32api.MessageBox(None, "WingetUI can't be installed in a path containing special characters. Please reinstall WingetUI on a valid location\n\n\nCurrent path: "+os.path.dirname(sys.executable)+"\nInvalid character detected: "+specialCharacter+"\n\n\nPlease run the WingetUI installer and select a different install location. A possible valid path could be C:\WingetUI", "WingetUI Crash handler", 0x00000010)
+    win32api.MessageBox(None, "WingetUI can't be installed in a path containing special characters. Please reinstall WingetUI on a valid location\n\n\nCurrent path: "+os.path.dirname(sys.executable)+"\nInvalid character detected: "+specialCharacter+"\n\n\nPlease run the WingetUI installer and select a different install location. A possible valid path could be C:\Program Files\WingetUI", "WingetUI Crash handler", 0x00000010)
     sys.exit(1)
 
 

wingetui/data/contributors.py

@@ -16,6 +16,7 @@
   "elliot-100",
   "neoOpus",
   "Satanarious",
+  "vsilvar",
   "quantumfallout",
   "derula",
   "flatron4eg",
@@ -28,7 +29,7 @@
   {
     "name": "marticliment",
     "link": "https://github.com/marticliment",
-    "contributions": 1737
+    "contributions": 1741
   },
   {
     "name": "ppvnf",
@@ -100,6 +101,11 @@
     "link": "https://github.com/Satanarious",
     "contributions": 1
   },
+  {
+    "name": "vsilvar",
+    "link": "https://github.com/vsilvar",
+    "contributions": 1
+  },
   {
     "name": "quantumfallout",
     "link": "https://github.com/quantumfallout",