assembly side effect fix

yermak · Nov 10, 2020 · 53f4bd1 · 53f4bd1
1 parent cdb7b28
commit 53f4bd1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/deploy/package/linux/package.sh b/src/main/deploy/package/linux/package.sh
@@ -6,22 +6,22 @@ $JAVA_HOME/bin/jlink --module-path $JAVA_HOME/jmods:$JAVAFX_MODS \
 --add-modules java.base,java.sql,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics --output target/fx-jre
 
 $JAVA_HOME/bin/jpackage --app-version %APP_VERSION%  -t app-image --name AudioBookConverter --vendor Recoupler \
---input target/package/audiobookconverter-%APP_VERSION%/audiobookconverter-%APP_VERSION%/app \
+--input target/package/audiobookconverter-%APP_VERSION%-linux-installer/audiobookconverter-%APP_VERSION%/app \
 --main-jar lib/audiobookconverter-%APP_VERSION%.jar --runtime-image target/fx-jre --dest target/image --java-options '--enable-preview'
 
 
 $JAVA_HOME/bin/jpackage --app-version $APP_VERSION  --license-file README.md --icon AudioBookConverter.png \
 -t deb --name AudioBookConverter --vendor Recoupler \
 --linux-menu-group AudioBookConverter --linux-shortcut \
 --linux-package-deps ffmpeg mp4v2-utils \
---input target/package/audiobookconverter-$APP_VERSION/audiobookconverter-$APP_VERSION/app \
+--input target/package/audiobookconverter-$APP_VERSION-linux-installer/audiobookconverter-$APP_VERSION/app \
 --main-jar lib/audiobookconverter-$APP_VERSION.jar --runtime-image target/fx-jre --java-options '--enable-preview'
 mv audiobookconverter-$APP_VERSION-1_amd64.deb target/
 
 $JAVA_HOME/bin/jpackage --app-version $APP_VERSION  --license-file README.md --icon AudioBookConverter.png \
 -t rpm --name AudioBookConverter --vendor Recoupler \
 --linux-menu-group AudioBookConverter --linux-shortcut \
 --linux-package-deps ffmpeg mp4v2-utils \
---input target/package/audiobookconverter-$APP_VERSION/audiobookconverter-$APP_VERSION/app \
+--input target/package/audiobookconverter-$APP_VERSION-linux-installer/audiobookconverter-$APP_VERSION/app \
 --main-jar lib/audiobookconverter-$APP_VERSION.jar --runtime-image target/fx-jre --java-options '--enable-preview'
 mv audiobookconverter-$APP_VERSION-1_amd64.rpm target/
diff --git a/src/main/deploy/package/windows/package.bat b/src/main/deploy/package/windows/package.bat
@@ -7,17 +7,17 @@ rmdir /s /q target\fx-jre
 "%JAVA_HOME%\bin\jlink.exe" --module-path %JAVA_HOME%\jmods;%JAVAFX_MODS% --add-modules java.base,java.sql,javafx.controls,javafx.fxml,javafx.media,javafx.base,javafx.swing,javafx.graphics --output target\fx-jre
 
 rmdir /s /q target\image\AudioBookConverter
-"%JAVA_HOME%\bin\jpackage.exe" --app-version %APP_VERSION%  --icon AudioBookConverter.ico -t app-image --name AudioBookConverter --vendor Recoupler --input target/package/audiobookconverter-%APP_VERSION%/audiobookconverter-%APP_VERSION%/app --main-jar lib/audiobookconverter-%APP_VERSION%.jar --runtime-image target/fx-jre --dest target/image --java-options '--enable-preview'
+"%JAVA_HOME%\bin\jpackage.exe" --app-version %APP_VERSION%  --icon AudioBookConverter.ico -t app-image --name AudioBookConverter --vendor Recoupler --input target/package/audiobookconverter-%APP_VERSION%-windows-installer/audiobookconverter-%APP_VERSION%/app --main-jar lib/audiobookconverter-%APP_VERSION%.jar --runtime-image target/fx-jre --dest target/image --java-options '--enable-preview'
 
 cd target\image\
 "%ARC7ZIP_HOME%\7z.exe" a -t7z -mx9 -mmt8 -sfx7z.sfx AudioBookConverter-Portable-%APP_VERSION%.exe AudioBookConverter
 move AudioBookConverter-Portable-%APP_VERSION%.exe ..\
 cd ..\..
 
-"%JAVA_HOME%\bin\jpackage.exe" --app-version %APP_VERSION%  --license-file README.md --icon AudioBookConverter.ico -t msi --win-dir-chooser --win-shortcut --win-menu --win-menu-group AudioBookConverter --name AudioBookConverter --vendor Recoupler --input target/package/audiobookconverter-%APP_VERSION%/audiobookconverter-%APP_VERSION%/app --main-jar lib/audiobookconverter-%APP_VERSION%.jar --runtime-image target/fx-jre --java-options '--enable-preview'
+"%JAVA_HOME%\bin\jpackage.exe" --app-version %APP_VERSION%  --license-file README.md --icon AudioBookConverter.ico -t msi --win-dir-chooser --win-shortcut --win-menu --win-menu-group AudioBookConverter --name AudioBookConverter --vendor Recoupler --input target/package/audiobookconverter-%APP_VERSION%-windows-installer/audiobookconverter-%APP_VERSION%/app --main-jar lib/audiobookconverter-%APP_VERSION%.jar --runtime-image target/fx-jre --java-options '--enable-preview'
 move AudioBookConverter-%APP_VERSION%.msi target/AudioBookConverter-All-Users-%APP_VERSION%.msi
 
-"%JAVA_HOME%\bin\jpackage.exe" --app-version %APP_VERSION%  --license-file README.md --icon AudioBookConverter.ico --win-per-user-install -t msi --win-shortcut --win-menu --win-menu-group AudioBookConverter --name AudioBookConverter --vendor Recoupler --input target/package/audiobookconverter-%APP_VERSION%/audiobookconverter-%APP_VERSION%/app --main-jar lib/audiobookconverter-%APP_VERSION%.jar --runtime-image target/fx-jre --java-options '--enable-preview'
+"%JAVA_HOME%\bin\jpackage.exe" --app-version %APP_VERSION%  --license-file README.md --icon AudioBookConverter.ico --win-per-user-install -t msi --win-shortcut --win-menu --win-menu-group AudioBookConverter --name AudioBookConverter --vendor Recoupler --input target/package/audiobookconverter-%APP_VERSION%-windows-installer/audiobookconverter-%APP_VERSION%/app --main-jar lib/audiobookconverter-%APP_VERSION%.jar --runtime-image target/fx-jre --java-options '--enable-preview'
 move AudioBookConverter-%APP_VERSION%.msi target/AudioBookConverter-Single-User-%APP_VERSION%.msi