edit releases in scripts, fix release text

config_override.sh

@@ -0,0 +1,82 @@
+#! /usr/bin/env bash
+
+## If you need to use a different JVM, JDK, or other utility from
+# build.sh, set it in this file, for example:
+
+uname=$(uname)
+
+#export PATH="$PATH:/c/Program Files/Java/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/Java/jdk-17.0.3"
+# to use it for Oracle OpenJDK18
+
+if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
+    PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+    export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+    JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+    export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+fi
+
+
+### TESTING: 
+## This isn't a default install location, obviously, it's where I unzipped it.
+## It won't work for you unless you kurtly tell Windows that your name is `user`
+## every time you make an account, like I do.
+#PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+#export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
+#JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+#export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+
+## Other potential values(NOT exhaustive):
+
+#export PATH="$PATH:/c/Program Files/Eclipse Adoptium/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/Eclipse Adoptium/jdk-17.0.3"
+#export PATH="$PATH:/c/Program Files/OpenJDK/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/OpenJDK/jdk-17.0.3"
+
+#BREAKS!
+#export PATH=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2/bin
+#export JAVA_HOME=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2
+#BREAKS!
+# might be fun to learn why this is broken
+
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+#export PATH="$PATH:/c/Program Files/Amazon Corretto/jdk17.0.3_6/bin/"
+#export JAVA_HOME="/c/Program Files/Amazon Corretto/jdk17.0.3_6"
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+
+# These are all things I built the package with today(April 20, 2022, idk)
+
+# Which will determine, of course, which java compilers you use and where
+# your JAVA_HOME(and thus your bootclasspath jars and stuff) come from.
+# So for you reddit nerds who are all into graalVM or whatever, this might
+# be where you go to mess with that.
+
+## Until 1.7.4, releases were built using Eclipse Adoptium OpenJDK
+# but it lags behind a day or two in security updates which did become
+# a major issue in April 2022. At this point it was migrated to Oracle's
+# JDK distribution which was more up to date. Should you prefer, or simply
+# wish to experiment with a different JVM, copy this file to `config_overrides.sh`
+# and add your JAVA_HOME and $PATH changes.
+
+# You can also use this to temporarily add applications into the PATH that are
+# required to build this if you do not wish to edit your PATH across the entire
+# Windows session, and for setting ANT_HOME
+#export ANT_HOME="/c/apache-ant-1.10.9"
+#export PATH="$PATH:$ANT_HOME/bin/"
+
+if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
+    PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+fi

daily-linux.sh

@@ -36,12 +36,12 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE\n"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="===================================================\n"
+===================================================
-  DESCRIPTION+="\n"
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs.\n"
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk.\n"
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+="\n"
+"
 fi
 
 echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

daily-unstable.sh

@@ -38,12 +38,12 @@ fi
 TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE\n"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="===================================================\n"
+===================================================
-  DESCRIPTION+="\n"
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs.\n"
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk.\n"
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+="\n"
+"
 fi
 
 echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

daily.sh

@@ -36,12 +36,12 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE\n"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="===================================================\n"
+===================================================
-  DESCRIPTION+="\n"
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs.\n"
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk.\n"
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+="\n"
+"
 fi
 
 echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

edit-release-unstable.sh

@@ -3,6 +3,8 @@
 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+
 . "$SCRIPT_DIR/i2pversion"
 
 if [ -f i2pversion_override ]; then
@@ -21,15 +23,15 @@ if [ -f ./i2pversion_override ]; then
   . ./i2pversion_override
 fi
 
-TODAYSDATE=$(date +%Y%m%d)
+TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE\n"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="===================================================\n"
+===================================================
-  DESCRIPTION+="\n"
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs.\n"
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk.\n"
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+="\n"
+"
 fi
 
 echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

edit-release.sh

@@ -24,12 +24,12 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE\n"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="===================================================\n"
+===================================================
-  DESCRIPTION+="\n"
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs.\n"
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk.\n"
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+="\n"
+"
 fi
 
 echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"