Make sure config files and config overrides always get loaded from the correct places

This commit is contained in:
idk
2022-07-15 23:45:55 -04:00
parent 12b18847c8
commit 429de25898
7 changed files with 42 additions and 11 deletions

View File

@ -4,16 +4,16 @@ set -e
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
cd "$SCRIPT_DIR" || exit 1
. i2pversion
. "$SCRIPT_DIR/i2pversion"
if [ -f i2pversion_override ]; then
. i2pversion_override
. "$SCRIPT_DIR/i2pversion_override"
fi
. config.sh
. "$SCRIPT_DIR/config.sh"
if [ -f config_overide.sh ]; then
. config_override.sh
. "$SCRIPT_DIR/config_override.sh"
fi
COUNT="Ten Nine Eight Seven Six Five Four Three Two One"

View File

@ -3,6 +3,12 @@
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
cd "$SCRIPT_DIR" || exit 1
. "$SCRIPT_DIR/config.sh"
if [ -f config_overide.sh ]; then
. "$SCRIPT_DIR/config_override.sh"
fi
cd ../i2p.i2p.jpackage-build/
ant distclean
git checkout .

View File

@ -9,7 +9,9 @@
## Other potential values(NOT exhaustive):
PATH="$PATH:/c/Program Files/Java/jdk-18.0.1.1/bin/"
export PATH="$PATH:/c/Program Files/Java/jdk-18.0.1.1/bin/"
JAVA_HOME="/c/Program Files/Java/jdk-18.0.1.1"
export JAVA_HOME="/c/Program Files/Java/jdk-18.0.1.1"
#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"
@ -48,4 +50,5 @@ export JAVA_HOME="/c/Program Files/Java/jdk-18.0.1.1"
#export PATH="$PATH:$ANT_HOME/bin/"
# Uncomment this to add signtool to the path so you don't have to fight with Visual Studio.
export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
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/"

View File

@ -3,6 +3,18 @@
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
cd "$SCRIPT_DIR" || exit 1
. "$SCRIPT_DIR/i2pversion"
if [ -f i2pversion_override ]; then
. "$SCRIPT_DIR/i2pversion_override"
fi
. "$SCRIPT_DIR/config.sh"
if [ -f config_overide.sh ]; then
. "$SCRIPT_DIR/config_override.sh"
fi
### How to set up this script:
#
# This script will not work unless you give it a Github API key.
@ -17,8 +29,6 @@ git checkout .
. "$HOME/github-release-config.sh"
. ./i2pversion
if [ -f ./i2pversion_override ]; then
. ./i2pversion_override
fi

View File

@ -3,5 +3,11 @@
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
cd "$SCRIPT_DIR" || exit 1
. "$SCRIPT_DIR/config.sh"
if [ -f config_overide.sh ]; then
. "$SCRIPT_DIR/config_override.sh"
fi
./unsigned.sh
./sign.sh

View File

@ -3,16 +3,16 @@
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
cd "$SCRIPT_DIR" || exit 1
. i2pversion
. "$SCRIPT_DIR/i2pversion"
if [ -f i2pversion_override ]; then
. i2pversion_override
. "$SCRIPT_DIR/i2pversion_override"
fi
. config.sh
. "$SCRIPT_DIR/config.sh"
if [ -f config_overide.sh ]; then
. config_override.sh
. "$SCRIPT_DIR/config_override.sh"
fi
linuxsign() {

View File

@ -3,6 +3,12 @@
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
cd "$SCRIPT_DIR" || exit 1
. "$SCRIPT_DIR/config.sh"
if [ -f config_overide.sh ]; then
. "$SCRIPT_DIR/config_override.sh"
fi
./clean.sh
wsl make distclean
wsl make clean-extensions