diff --git a/build.sh b/build.sh index 0d26bdc..b52a048 100755 --- a/build.sh +++ b/build.sh @@ -47,6 +47,7 @@ rm -rf I2P make src/I2P/config +if [ ! -d "I2P" ]; then "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \ --verbose \ --java-options "-Xmx512m" \ @@ -63,6 +64,7 @@ make src/I2P/config --app-content src/icons/ui2pbrowser_icon.ico \ --icon src/icons/windowsUIToopie2.png \ --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher +fi cp "$I2P_PKG/licenses/"* license/ cp "$HERE/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt diff --git a/getprebuilt.sh b/getprebuilt.sh index b951de0..c850f34 100755 --- a/getprebuilt.sh +++ b/getprebuilt.sh @@ -18,7 +18,9 @@ fi . "$HOME/github-release-config.sh" -TODAYSDATE=$(date -d '-1 day' '+%Y%m%d') +if [ -z $TODAYSDATE ]; then + TODAYSDATE=$(date -d '-1 day' '+%Y%m%d') +fi echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE" github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE" diff --git a/src/win/torbrowser.sh b/src/win/torbrowser.sh new file mode 100644 index 0000000..6a6a78f --- /dev/null +++ b/src/win/torbrowser.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +TORSOCKS=$(which torsocks) +#if [ -f "${TORSOCKS}" ]; then +# . "${TORSOCKS}" on +#fi + +version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")" +locale="en-US" # mention your locale. default = en-US +if [ -d /etc/default/locale ]; then + . /etc/default/locale + locale=$(echo "${LANG}" | cut -d . -f1) +fi + +if [ ! -f ./tor.keyring ]; then + gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org + gpg --output ./tor.keyring --export torbrowser@torproject.org +fi + +if [ ! -f "tor-browser-linux64-${version}_${locale}.exe" ]; then + wget -cv "https://www.torproject.org/dist/torbrowser/${version}/torbrowser-install-win64-${version}_${locale}.exe" + wget -cv "https://www.torproject.org/dist/torbrowser/${version}/torbrowser-install-win64-${version}_${locale}.exe.asc" +fi + +gpgv --keyring ./tor.keyring "torbrowser-install-win64-${version}_${locale}.exe.asc" "torbrowser-install-win64-${version}_${locale}.exe" + +#tar xvJf "torbrowser-install-win64-${version}_${locale}.exe" +#for n in `seq 1 2000`; do echo $n; dd ibs=256 if="torbrowser-install-win64-${version}_${locale}.exe" count=2 skip=$n | file - ; done 2>/dev/null |less +#zip -FF "torbrowser-install-win64-${version}_${locale}.exe" --out extracted.zip +export WINEPREFIX=$(pwd)/tmp +wine "torbrowser-install-win64-${version}_${locale}.exe" /S /D . +cp -vr "$WINEPREFIX/drive_c/users/idk/Desktop/Tor Browser/" "I2P/Tor Browser" \ No newline at end of file diff --git a/targz.sh b/targz.sh index e47a9d5..cd7bc1a 100755 --- a/targz.sh +++ b/targz.sh @@ -29,7 +29,4 @@ fi rm -vrf "tor-browser_${locale}" cd "$SCRIPT_DIR" || exit 1 - - - tar czvf I2P.tar.gz I2P