diff options
Diffstat (limited to 'installer_scripts')
| -rw-r--r-- | installer_scripts/inkstitch.plist | 2 | ||||
| -rwxr-xr-x | installer_scripts/scripts/preinstall | 14 | ||||
| -rwxr-xr-x | installer_scripts/template.iss | 14 |
3 files changed, 16 insertions, 14 deletions
diff --git a/installer_scripts/inkstitch.plist b/installer_scripts/inkstitch.plist index 8d102d1f..4d85c7a5 100644 --- a/installer_scripts/inkstitch.plist +++ b/installer_scripts/inkstitch.plist @@ -12,7 +12,7 @@ <key>BundleOverwriteAction</key> <string>install</string> <key>RootRelativeBundlePath</key> - <string>Contents/MacOS/electron/inkstitch-gui.app</string> + <string>Contents/Frameworks/electron/inkstitch-gui.app</string> </dict> </array> </plist> diff --git a/installer_scripts/scripts/preinstall b/installer_scripts/scripts/preinstall index 165128a7..01427651 100755 --- a/installer_scripts/scripts/preinstall +++ b/installer_scripts/scripts/preinstall @@ -1,25 +1,13 @@ #!/bin/bash set -e inkstitch_folder=($HOME/Library/Application\ Support/org.inkscape.Inkscape/config/inkscape/extensions/inkstitch) -location_inkscape=(/Applications/Inkscape.app) - -# Checking if Inkscape is installed -if [[ -d "${location_inkscape}" ]]; then - echo "Inkscape is found and installed "${location_Inkscape}"." -else - osascript <<-AppleScript - set theDialogText to "Ink/Stich is an Inkscape plugin. Please install and run Inkscape before installing Ink/Stitch." - display dialog theDialogText buttons {"Okay"} default button "Okay" - AppleScript - exit 1 -fi # Checking if Inkscape configuration folders are created if [[ -d "${inkstitch_folder%config*}" ]]; then echo "Inkscape configs are found and installed "${inkstitch_folder%config*}"." else osascript <<-AppleScript - set theDialogText to "Please run Inkscape before installing Ink/Stitch." + set theDialogText to "Ink/Stich is an Inkscape plugin. Please install and run Inkscape before installing Ink/Stitch." display dialog theDialogText buttons {"Okay"} default button "Okay" AppleScript exit 1 diff --git a/installer_scripts/template.iss b/installer_scripts/template.iss index 99ae6d33..8dd26976 100755 --- a/installer_scripts/template.iss +++ b/installer_scripts/template.iss @@ -119,6 +119,20 @@ begin end;
{ ///////////////////////////////////////////////////////////////////// }
+function InitializeSetup(): Boolean;
+begin
+ Result := True;
+
+ if DirExists(ExpandConstant('{userappdata}\inkscape\extensions\')) then
+ Log('Found Inks')
+ else
+ begin
+ MsgBox('Error: Inkscape Extensions folder not found! Install and then run Inkscape to create the extension folder.', mbInformation, MB_OK);
+ Result := False;
+ end;
+end;
+
+{ ///////////////////////////////////////////////////////////////////// }
procedure CurStepChanged(CurStep: TSetupStep);
begin
if (CurStep=ssInstall) then
|