diff --git a/CHANGES.md b/CHANGES.md index cfed611..e2e3764 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,8 @@ Mon, September 5 - Fix several issues with running on Windows 11 - Make tunnel nicknames different to avoid double shared tunnels + - Since Windows is apparently crazy and there's nothing I can do about it right now + make a deb. Fri, September 2 ---------------- diff --git a/config.sh b/config.sh new file mode 100644 index 0000000..06bc974 --- /dev/null +++ b/config.sh @@ -0,0 +1,6 @@ +#! /usr/bin/env sh +export GITHUB_USER=eyedeekay +export GITHUB_REPO=i2p.plugins.firefox +export GITHUB_NAME="Always pass --new-instance to Firefox" +export GITHUB_DESCRIPTION=$(cat CHANGES.md) +export GITHUB_TAG=0.0.26 \ No newline at end of file diff --git a/debian.sh b/debian.sh index 63d82eb..c5154c9 100755 --- a/debian.sh +++ b/debian.sh @@ -1,3 +1,10 @@ #! /usr/bin/env sh -jpackage --verbose --type deb --name i2pbrowser --app-version 0.0.26 --input src/build --main-jar i2pfirefox.jar --main-class net.i2p.i2pfirefox.I2PBrowser +. config.sh +jpackage --verbose \ + --type deb \ + --name i2pbrowser \ + --app-version "$GITHUB_TAG" \ + --input src/build \ + --main-jar i2pfirefox.jar \ + --main-class net.i2p.i2pfirefox.I2PBrowser diff --git a/release.sh b/release.sh index 9fe7455..bb62f82 100755 --- a/release.sh +++ b/release.sh @@ -1,16 +1,12 @@ #! /usr/bin/env sh -GITHUB_USER=eyedeekay -GITHUB_REPO=i2p.plugins.firefox -GITHUB_NAME="Always pass --new-instance to Firefox" -GITHUB_DESCRIPTION=$(cat CHANGES.md) -GITHUB_TAG=0.0.26 +. config.sh ant distclean ./javadoc.sh NUMLINE=`grep release.number build.xml | head -n 1` sed -i "s|$NUMLINE| |g" build.xml edgar && git push --all -ant jar freeZip jpackage +ant jar freeZip jpackage debian github-release release --user "${GITHUB_USER}" \ --repo "${GITHUB_REPO}" \ --name "${GITHUB_NAME}" \ @@ -45,6 +41,13 @@ github-release upload --user "${GITHUB_USER}" \ --label "I2P Browser launcher as a Jpackage, does not require a JVM, Linux Only for now unless you BYO." \ --name "i2pbrowser.zip" \ --file "i2pbrowser.zip" \ + --replace +github-release upload --user "${GITHUB_USER}" \ + --repo "${GITHUB_REPO}" \ + --tag "${GITHUB_TAG}" \ + --label "I2P Browser launcher as a Jpackage inside of a Debian package." \ + --name "i2pbrowser.deb" \ + --file "i2pbrowser.deb" \ --replace echo "Uploaded jpackage zip" git pull github --tags diff --git a/windows.sh b/windows.sh new file mode 100755 index 0000000..07ddfae --- /dev/null +++ b/windows.sh @@ -0,0 +1,10 @@ +#! /usr/bin/env sh +. config.sh +jpackage \ + --verbose \ + --type msi \ + --name i2pbrowser \ + --app-version "$GITHUB_TAG" \ + --input src/build \ + --main-jar i2pfirefox.jar \ + --main-class net.i2p.i2pfirefox.I2PBrowser