Merge pull request #38 from jgonyea/feature-menu-icons

Add git-bash and git-gui menu items to PA menu
sheabunge · Jan 23, 2020 · 80698fb · 80698fb
2 parents 40de1e5 + 8a7f26e
commit 80698fb
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 6 deletions.
diff --git a/GitPortable/App/AppInfo/AppIcon1.ico b/GitPortable/App/AppInfo/AppIcon1.ico
diff --git a/GitPortable/App/AppInfo/AppIcon1_128.png b/GitPortable/App/AppInfo/AppIcon1_128.png
diff --git a/GitPortable/App/AppInfo/AppIcon1_16.png b/GitPortable/App/AppInfo/AppIcon1_16.png
diff --git a/GitPortable/App/AppInfo/AppIcon1_32.png b/GitPortable/App/AppInfo/AppIcon1_32.png
diff --git a/GitPortable/App/AppInfo/AppIcon2.ico b/GitPortable/App/AppInfo/AppIcon2.ico
diff --git a/GitPortable/App/AppInfo/AppIcon2_128.png b/GitPortable/App/AppInfo/AppIcon2_128.png
diff --git a/GitPortable/App/AppInfo/AppIcon2_16.png b/GitPortable/App/AppInfo/AppIcon2_16.png
diff --git a/GitPortable/App/AppInfo/AppIcon2_32.png b/GitPortable/App/AppInfo/AppIcon2_32.png
diff --git a/GitPortable/App/AppInfo/AppInfo.ini b/GitPortable/App/AppInfo/AppInfo.ini
@@ -19,9 +19,13 @@ Freeware=true
 CommercialUse=true
 
 [Version]
-PackageVersion=2.21.0.0
-DisplayVersion=2.21.0 Development Test 1
+PackageVersion=2.24.0.0
+DisplayVersion=2.24.0 Development Test 1
 
 [Control]
-Icons=1
+Icons=2
 Start=GitPortable.exe
+Start1=GitPortable.exe
+Name1=Git-GUI Portable
+Start2=GitBashPortable.exe
+Name2=Git-Bash Portable
diff --git a/GitPortable/App/AppInfo/Installer.ini b/GitPortable/App/AppInfo/Installer.ini
@@ -4,9 +4,9 @@ CloseEXE=git-bash.exe
 [DownloadFiles]
 AdditionalInstallSize=42181
 
-DownloadURL=https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe
+DownloadURL=https://github.com/git-for-windows/git/releases/download/v2.24.0.windows.2/PortableGit-2.24.0.2-32-bit.7z.exe
 DownloadName=Git for Windows
-DownloadFilename=PortableGit-2.21.0-32-bit.7z.exe
-DownloadMD5=cf1655a955df68febf40b7ff1935ca32
+DownloadFilename=PortableGit-2.24.0.2-32-bit.7z.exe
+DownloadMD5=e03b5fb3d6b2b99e1bb05b34c502ed40
 AdvancedExtract1To=App\Git
 AdvancedExtract1Filter=**
diff --git a/GitPortable/App/AppInfo/Launcher/GitBashPortable.ini b/GitPortable/App/AppInfo/Launcher/GitBashPortable.ini
@@ -0,0 +1,30 @@
+[Launch]
+ProgramExecutable=Git\git-bash.exe
+WorkingDirectory=%PAL:DataDir%\home
+WaitForEXE1=wish.exe
+WaitForEXE2=git-bash.exe
+WaitForEXE3=gitk.exe
+WaitForEXE4=git.exe
+DirectoryMoveOK=yes
+MinOS=Vista
+
+[Environment]
+HOME=%PAL:DataDir%\home
+
+[FileWrite1]
+Type=Replace
+File=%PAL:DataDir%\home\.gitconfig
+Find=%PAL:LastDrive:ForwardSlash%%PAL:LastPackagePartialDir:ForwardSlash%
+Replace=%PAL:Drive:ForwardSlash%%PAL:PackagePartialDir:ForwardSlash%
+
+[FileWrite2]
+Type=Replace
+File=%PAL:DataDir%\home\.gitconfig
+Find=%PAL:LastPortableAppsBaseDir:ForwardSlash%
+Replace=%PAL:PortableAppsBaseDir:ForwardSlash%
+
+[FileWrite3]
+Type=Replace
+File=%PAL:DataDir%\home\.gitconfig
+Find=%PAL:LastDrive%/
+Replace=%PAL:Drive%/
diff --git a/GitPortable/App/AppInfo/appicon1_75.png b/GitPortable/App/AppInfo/appicon1_75.png
diff --git a/GitPortable/App/AppInfo/appicon2_75.png b/GitPortable/App/AppInfo/appicon2_75.png
diff --git a/GitPortable/GitBashPortable.exe b/GitPortable/GitBashPortable.exe