gimp: fix 32bit install (#6598)

* Fix the 32bit install script for Gimp 2.10.24-3 * Fix indentation
ScoopInstaller · Nov 3, 2021 · 01ed19b · 01ed19b
1 parent c77c226
commit 01ed19b
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/bucket/gimp.json b/bucket/gimp.json
@@ -1,30 +1,27 @@
 {
-    "version": "2.10.20-1",
+    "version": "2.10.24-3",
     "description": "GNU Image Manipulation Program",
     "homepage": "https://www.gimp.org",
     "license": "GPL-3.0-only",
-    "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.20-setup-1.exe",
-    "hash": "430b1a709cd89b5cddb857032a7a5b93199d076ff8cd83ebdd0112330b65ba51",
+    "url": "https://download.gimp.org/mirror/pub/gimp/v2.10/windows/gimp-2.10.24-setup-3.exe",
+    "hash": "5e9eabe5739523a9fc347b4614d919418f3335e7aab082a65f71705421e85e04",
     "innosetup": true,
     "installer": {
         "script": [
             "Push-Location \"$dir\"",
             "Get-ChildItem -Filter '*.debug' -Recurse | Remove-Item -Recurse",
             "if ($architecture -eq '64bit') {",
+            "   Rename-Item 'lib\\gimp\\2.0\\plug-ins\\twain\\twain,3.exe' 'twain.exe'",
+            "   Remove-Item 'lib\\gimp\\2.0\\plug-ins\\twain\\twain,1.exe'",
+            "   Get-ChildItem -Filter '*,1*' -Recurse | Rename-Item -NewName { $_.name -Replace ',\\d','' }",
+            "   Get-ChildItem -Filter '*,*' -Recurse | Remove-Item",
+            "} else {",
             "   Rename-Item 'lib\\gimp\\2.0\\plug-ins\\twain\\twain,1.exe' 'twain.exe'",
-            "   Remove-Item 'lib\\gimp\\2.0\\plug-ins\\twain\\twain,*.exe'",
+            "   Remove-Item 'lib\\gimp\\2.0\\plug-ins\\twain\\twain,3.exe'",
             "   Get-ChildItem -Filter '*,1*' -Recurse | Remove-Item",
             "   Get-ChildItem -Filter '*,*' -Recurse | Rename-Item -NewName { $_.name -Replace ',\\d','' }",
-            "   New-Item '32\\etc', '32\\share', 'share\\gimp\\2.0\\fonts' -ItemType 'Directory' | Out-Null",
-            "   Copy-Item 'etc\\fonts', 'etc\\gtk-2.0' '32\\etc' -Recurse",
-            "   Copy-Item 'share\\themes' '32\\share' -Recurse",
-            "   $defpath = \"`nPATH=`${gimp_installation_dir}\\bin;`${gimp_installation_dir}\\32\\bin`n\"",
-            "} else {",
-            "   Get-ChildItem -Filter '*,1*' -Recurse | Rename-Item -NewName { $_.name -Replace ',1','' }",
-            "   Get-ChildItem -Filter '*,*' -Recurse | Remove-Item",
-            "   movedir \"$dir\\32\" \"$dir\" | Out-Null",
-            "   $defpath = \"`nPATH=`${gimp_installation_dir}\\bin`n\"",
             "}",
+            "$defpath = \"`nPATH=`${gimp_installation_dir}\\bin`n\"",
             "$defenv = Get-Content 'lib\\gimp\\2.0\\environ\\default.env' -Raw",
             "$defenv += $defpath",
             "$defenv += \"PYTHONPATH=`${gimp_installation_dir}\\lib\\gimp\\2.0\\python;`${gimp_plug_in_dir}\\plug-ins\\python-console\"",