From 320ef32cb4b66012cc724286896114636cf39dcc Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 21 Mar 2016 16:14:06 +0100
Subject: [PATCH 1/2] installer: introduce a --skip-files option for debugging

Compressing the entire set of files really takes a long time...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 installer/install.iss | 2 ++
 installer/release.sh  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/installer/install.iss b/installer/install.iss
index d6d32d6525..123fb0a94c 100644
--- a/installer/install.iss
+++ b/installer/install.iss
@@ -1407,6 +1407,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" \

From 3437da85ea44ebc209169a051cb18c471dbd7405 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 21 Mar 2016 16:54:04 +0100
Subject: [PATCH 2/2] installer: change the "Next" label to "Install" just
 before installing

The last wizard page before the installation starts should give the user
an indication that this is what is going to happen.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 installer/install.iss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/installer/install.iss b/installer/install.iss
index 123fb0a94c..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;