diff --git a/buildscripts/launcher.sh b/buildscripts/launcher.sh index 940db15..1ddc247 100755 --- a/buildscripts/launcher.sh +++ b/buildscripts/launcher.sh @@ -58,14 +58,20 @@ if [ -z "$EXTRA" ]; then fi if [ "$VERSION" = master ]; then VERSIONDATE="$(date +%m%d)" + export CHECKOUT_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD" +else + export CHECKOUT_VERSION="$VERSION" fi + + + find . -name RouterVersion.java -exec sed -i "s|$OLDEXTRA|$EXTRA|g" {} \; git switch - || : git pull --tags -git checkout -b "i2p-$VERSION$VERSIONDATE-$EXTRACODE" || : -git commit -am "i2p-$VERSION$VERSIONDATE-$EXTRACODE" || : -git archive --format=tar.gz --output="$SCRIPT_DIR/../i2p.firefox/i2p.i2p.jpackage-build.tar.gz" "i2p-$VERSION$VERSIONDATE-$EXTRACODE" -git checkout "i2p-$VERSION$VERSIONDATE-$EXTRACODE" || : +git checkout -b "i2p-$CHECKOUT_VERSION$VERSIONDATE-$EXTRACODE" || : +git commit -am "i2p-$CHECKOUT_VERSION$VERSIONDATE-$EXTRACODE" || : +git archive --format=tar.gz --output="$SCRIPT_DIR/../i2p.firefox/i2p.i2p.jpackage-build.tar.gz" "i2p-$CHECKOUT_VERSION$VERSIONDATE-$EXTRACODE" +git checkout "i2p-$CHECKOUT_VERSION$VERSIONDATE-$EXTRACODE" || : for i in $COUNT; do echo -n "$i...."; sleep 1s diff --git a/i2pversion b/i2pversion index 10c0642..3cc28e2 100644 --- a/i2pversion +++ b/i2pversion @@ -22,5 +22,7 @@ I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD" export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD" # Comment this out to build from an alternate branch or # the tip of the master branch. -VERSION=i2p-2.4.0 -export VERSION=i2p-2.4.0 \ No newline at end of file +#VERSION=i2p-2.4.0 +#export VERSION=i2p-2.4.0 +VERSION=master +export VERSION=master \ No newline at end of file