diff --git a/installer/install.iss b/installer/install.iss index d6d32d6525..fec843ed40 100644 --- a/installer/install.iss +++ b/installer/install.iss @@ -338,6 +338,7 @@ var ProcessesPage:TWizardPage; ProcessesListBox:TListBox; ProcessesRefresh,ContinueButton:TButton; + PageIDBeforeInstall:Integer; #ifdef DEBUG_WIZARD_PAGE DebugWizardPage:Integer; #endif @@ -1112,6 +1113,8 @@ begin // This button is only used by the uninstaller. ContinueButton:=NIL; + PageIDBeforeInstall:=ExtraOptionsPage.ID; + #ifdef DEBUG_WIZARD_PAGE DebugWizardPage:={#DEBUG_WIZARD_PAGE}.ID; #endif @@ -1147,9 +1150,14 @@ begin // This will be checked later again when the user clicks "Next". WizardForm.DirEdit.Text:=ExpandConstant('{userpf}\{#APP_NAME}'); end; + end else if CurPageID=PageIDBeforeInstall then begin + RefreshProcessList(NIL); + if GetArrayLength(Processes)=0 then + WizardForm.NextButton.Caption:=SetupMessage(msgButtonInstall); end else if (ProcessesPage<>NIL) and (CurPageID=ProcessesPage.ID) then begin // Show the "Refresh" button only on the processes page. ProcessesRefresh.Show; + WizardForm.NextButton.Caption:=SetupMessage(msgButtonInstall); end else begin ProcessesRefresh.Hide; end; @@ -1407,6 +1415,8 @@ begin // Load the built-ins from a text file. FileName:=AppDir+'\{#MINGW_BITNESS}\{#APP_BUILTINS}'; + if not FileExists(FileName) then + Exit; // testing... if LoadStringsFromFile(FileName,BuiltIns) then begin Count:=GetArrayLength(BuiltIns)-1; diff --git a/installer/release.sh b/installer/release.sh index 48b178b764..153bb6c733 100755 --- a/installer/release.sh +++ b/installer/release.sh @@ -65,6 +65,9 @@ do -f|--force) force=t ;; + --skip-files) + skip_files=t + ;; --debug-wizard-page=*) test_installer=t inno_defines="$(printf "%s\n%s\n%s" "$inno_defines" \