quote some things that need quoted

This commit is contained in:
idk
2021-03-22 17:02:33 -04:00
parent f92af02722
commit 863588d094

View File

@ -25,49 +25,49 @@ I2P_PKG=$HERE/../i2p.i2p/pkg-temp
echo "preparing resources.csv"
mkdir build
cd $RES_DIR
find certificates -name *.crt -exec echo '{},{},true' >> $HERE/build/resources.csv \;
cd "$RES_DIR"
find certificates -name *.crt -exec echo '{},{},true' >> "$HERE"/build/resources.csv \;
cd portable/configs
find . -name '*.config' -exec echo 'config/{},{},false' >> $HERE/build/resources.csv \;
echo "config/hosts.txt,hosts.txt,false" >> $HERE/build/resources.csv
find . -name '*.config' -exec echo 'config/{},{},false' >> "$HERE"/build/resources.csv \;
echo "config/hosts.txt,hosts.txt,false" >> "$HERE"/build/resources.csv
echo "preparing webapps"
cd $I2P_PKG
find webapps -name '*.war' -exec echo '{},{},true' >> $HERE/build/resources.csv \;
cd "$I2P_PKG"
find webapps -name '*.war' -exec echo '{},{},true' >> "$HERE"/build/resources.csv \;
# TODO add others
cd $HERE
cd "$HERE"
echo "geoip/GeoLite2-Country.mmdb,geoip/GeoLite2-Country.mmdb,true" >> build/resources.csv
# TODO: decide on blocklist.txt
sed -i 's|\./||g' build/resources.csv
echo "copying certificates"
cp -R $RES_DIR/certificates build/
cp -R "$RES_DIR"/certificates build/
echo "copying config"
cp -R $RES_DIR/portable/configs build/config
cp -R $RES_DIR/hosts.txt build/config/hosts.txt
cp -R $I2P_PKG/webapps build/
cp -R "$RES_DIR"/portable/configs build/config
cp -R "$RES_DIR"/hosts.txt build/config/hosts.txt
cp -R "$I2P_PKG"/webapps build/
echo "copying GeoIP"
mkdir build/geoip
cp $RES_DIR/GeoLite2-Country.mmdb.gz build/geoip
cp "$RES_DIR"/GeoLite2-Country.mmdb.gz build/geoip
gunzip build/geoip/GeoLite2-Country.mmdb.gz
echo "compiling custom launcher"
cp $I2P_JARS/*.jar build
cp "$I2P_JARS"/*.jar build
cd java
$JAVA_HOME/bin/javac -d ../build -classpath ../build/i2p.jar:../build/router.jar net/i2p/router/PackageLauncher.java
"$JAVA_HOME"/bin/javac -d ../build -classpath ../build/i2p.jar:../build/router.jar net/i2p/router/PackageLauncher.java
cd ..
echo "building launcher.jar"
cd build
$JAVA_HOME/bin/jar -cf launcher.jar net certificates geoip config webapps resources.csv
"$JAVA_HOME"/bin/jar -cf launcher.jar net certificates geoip config webapps resources.csv
cd ..
echo "preparing to invoke jpackage"
cp $I2P_JARS/*.jar build
cp "$I2P_JARS"/*.jar build
if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
$JAVA_HOME/bin/jpackage --type app-image --name I2P --input build --main-jar launcher.jar --main-class net.i2p.router.PackageLauncher
"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --input build --main-jar launcher.jar --main-class net.i2p.router.PackageLauncher
else
$JAVA_HOME/bin/jpackage --name I2P --input build --main-jar launcher.jar --main-class net.i2p.router.PackageLauncher
"$JAVA_HOME"/bin/jpackage --name I2P --input build --main-jar launcher.jar --main-class net.i2p.router.PackageLauncher
fi