diff --git a/scripts/bundler.sh b/scripts/bundler.sh index 073116b4..e4878d51 100755 --- a/scripts/bundler.sh +++ b/scripts/bundler.sh @@ -180,31 +180,27 @@ make_macos_bundle() { # https://wiki.debian.org/SimplePackagingTutorial # https://www.debian.org/doc/manuals/packaging-tutorial/packaging-tutorial.pdf make_deb_package() { - local temp_dir - temp_dir="$(mktemp -d)" - trap "rm -rf $temp_dir" RETURN - - cp "$JAR" "$RELEASE_NAME/Tachidesk-Server.jar" - tar -I "gzip" -cvf "$RELEASE_NAME.tar.gz" "$RELEASE_NAME/" - #behind $RELEASE_VERSION is underscore "_" - local upstream_source="tachidesk-server_$RELEASE_VERSION.orig.tar.gz" - mv "$RELEASE_NAME.tar.gz" "$temp_dir/$upstream_source" - - cp -r "scripts/resources/deb/" "$RELEASE_NAME/debian/" - copy_linux_package_assets_to "$RELEASE_NAME/debian/" - sed -i "s/\$pkgver/$RELEASE_VERSION/" "$RELEASE_NAME/debian/changelog" - sed -i "s/\$pkgrel/1/" "$RELEASE_NAME/debian/changelog" #behind $RELEASE_VERSION is hyphen "-" local source_dir="tachidesk-server-$RELEASE_VERSION" - mv "$RELEASE_NAME/" "$temp_dir/$source_dir/" + #behind $RELEASE_VERSION is underscore "_" + local upstream_source="tachidesk-server_$RELEASE_VERSION.orig.tar.gz" + + mkdir "$RELEASE_NAME/$source_dir/" + cp "$JAR" "$RELEASE_NAME/$source_dir/Tachidesk-Server.jar" + copy_linux_package_assets_to "$RELEASE_NAME/$source_dir/" + tar -I "gzip" -C "$RELEASE_NAME/" -cvf "$upstream_source" "$source_dir" + + cp -r "scripts/resources/deb/" "$RELEASE_NAME/$source_dir/debian/" + sed -i "s/\$pkgver/$RELEASE_VERSION/" "$RELEASE_NAME/$source_dir/debian/changelog" + sed -i "s/\$pkgrel/1/" "$RELEASE_NAME/$source_dir/debian/changelog" sudo apt install devscripts build-essential dh-exec - cd "$temp_dir/$source_dir/" + cd "$RELEASE_NAME/$source_dir/" dpkg-buildpackage --no-sign --build=all cd - local deb="tachidesk-server_$RELEASE_VERSION-1_all.deb" - mv "$temp_dir/$deb" "$RELEASE" + mv "$RELEASE_NAME/$deb" "$RELEASE" } make_windows_bundle() { diff --git a/scripts/resources/deb/install b/scripts/resources/deb/install index 9d1355e1..b727cfff 100755 --- a/scripts/resources/deb/install +++ b/scripts/resources/deb/install @@ -1,12 +1,12 @@ #!/usr/bin/dh-exec -Tachidesk-Server.jar usr/share/java/tachidesk-server/ -debian/tachidesk-server.png usr/share/pixmaps/ -debian/tachidesk-server.desktop usr/share/applications/ -debian/tachidesk-server.service usr/lib/systemd/system/ -debian/tachidesk-server.sysusers => usr/lib/sysusers.d/tachidesk-server.conf -debian/tachidesk-server.tmpfiles => usr/lib/tmpfiles.d/tachidesk-server.conf -debian/tachidesk-server.conf => etc/tachidesk/server.conf -debian/tachidesk-server-browser-launcher.sh => usr/bin/tachidesk-server-browser -debian/tachidesk-server-debug-launcher.sh => usr/bin/tachidesk-server-debug -debian/tachidesk-server-electron-launcher.sh => usr/bin/tachidesk-server-electron +Tachidesk-Server.jar usr/share/java/tachidesk-server/ +tachidesk-server.png usr/share/pixmaps/ +tachidesk-server.desktop usr/share/applications/ +tachidesk-server.service usr/lib/systemd/system/ +tachidesk-server.sysusers => usr/lib/sysusers.d/tachidesk-server.conf +tachidesk-server.tmpfiles => usr/lib/tmpfiles.d/tachidesk-server.conf +tachidesk-server.conf => etc/tachidesk/server.conf +tachidesk-server-browser-launcher.sh => usr/bin/tachidesk-server-browser +tachidesk-server-debug-launcher.sh => usr/bin/tachidesk-server-debug +tachidesk-server-electron-launcher.sh => usr/bin/tachidesk-server-electron