fix paths in moved buildscripts

This commit is contained in:
idk
2023-01-23 16:50:03 +00:00
parent 2a162fb4c1
commit c678c6eca2
14 changed files with 23 additions and 24 deletions

View File

@@ -29,11 +29,11 @@ ICON="src/icons/ui2pbrowser_icon.ico"
if [ "$machine" = "Mac" ]; then if [ "$machine" = "Mac" ]; then
rm -rf I2P rm -rf I2P
./getprebuilt.sh ./buildscripts/getprebuilt.sh
exit 0 exit 0
elif [ "$machine" = "Linux" ]; then elif [ "$machine" = "Linux" ]; then
rm -rf I2P rm -rf I2P
./getprebuilt.sh ./buildscripts/getprebuilt.sh
exit 0 exit 0
elif [ "$machine" = "unix" ]; then elif [ "$machine" = "unix" ]; then
ICON=src/icons/windowsUIToopie2.png ICON=src/icons/windowsUIToopie2.png

View File

@@ -25,7 +25,7 @@ fi
# GITHUB_USERNAME=your github username # GITHUB_USERNAME=your github username
git clean -fd git clean -fd
git checkout . git checkout .
./targz.sh ./buildscripts/targz.sh
. "$HOME/github-release-config.sh" . "$HOME/github-release-config.sh"

View File

@@ -46,7 +46,7 @@ fi
echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE" echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE" github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
./zip.sh ./buildscripts/zip.sh
WINZIPCHECKSUM=$(sha256sum "I2P-windows-portable.zip") WINZIPCHECKSUM=$(sha256sum "I2P-windows-portable.zip")
echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip" echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip"
github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip" github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip"

View File

@@ -25,7 +25,7 @@ fi
git clean -fd git clean -fd
git checkout . git checkout .
cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
./unsigned.sh ./buildscripts/unsigned.sh
. "$HOME/github-release-config.sh" . "$HOME/github-release-config.sh"

View File

@@ -22,7 +22,7 @@ mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
# GITHUB_USERNAME=your github username # GITHUB_USERNAME=your github username
git clean -fd git clean -fd
git checkout . git checkout .
./unsigned.sh ./buildscripts/unsigned.sh
. "$HOME/github-release-config.sh" . "$HOME/github-release-config.sh"

View File

@@ -9,7 +9,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./clean.sh ./buildscripts/clean.sh
wsl make distclean wsl make distclean
./build.sh ./buildscripts/build.sh
wsl make wsl make

View File

@@ -28,4 +28,4 @@ if [ ! -f I2P.zip ]; then
fi fi
unzip I2P.zip unzip I2P.zip
sleep 3 sleep 3
./fixperms.sh ./buildscripts/fixperms.sh

View File

@@ -8,7 +8,7 @@ cd "$SCRIPT_DIR" || exit 1
. ./config.sh . ./config.sh
. ./i2pversion . ./i2pversion
./build.sh ./buildscripts/build.sh
jpackage --name I2P-MSI --app-version "$I2P_VERSION" \ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
--verbose \ --verbose \
--java-options "-Xmx512m" \ --java-options "-Xmx512m" \

View File

@@ -9,5 +9,5 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./unsigned.sh ./buildscripts/unsigned.sh
./sign.sh ./buildscripts/sign.sh

View File

@@ -9,9 +9,9 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
export machine=unix export machine=unix
./clean.sh ./buildscripts/clean.sh
wsl make distclean wsl make distclean
./build.sh ./buildscripts/build.sh
cd "$SCRIPT_DIR/I2P" || exit 1 cd "$SCRIPT_DIR/I2P" || exit 1
TORSOCKS=$(which torsocks) TORSOCKS=$(which torsocks)

View File

@@ -9,7 +9,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./clean.sh ./buildscripts/clean.sh
wsl make distclean wsl make distclean
./build.sh ./buildscripts/build.sh
wsl make wsl make

View File

@@ -8,17 +8,16 @@ cd "$SCRIPT_DIR" || exit 1
if [ -f "$SCRIPT_DIR/config_override.sh" ]; then if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh" . "$SCRIPT_DIR/config_override.sh"
fi fi
./clean.sh ./buildscripts/clean.sh
wsl make distclean wsl make distclean
./build.sh ./buildscripts/build.sh
./fixperms.sh ./buildscripts/fixperms.sh
cd "$SCRIPT_DIR/I2P" || exit 1 cd "$SCRIPT_DIR/I2P" || exit 1
TORSOCKS=$(which torsocks) TORSOCKS=$(which torsocks)
if [ -f "${TORSOCKS}" ]; then if [ -f "${TORSOCKS}" ]; then
. "${TORSOCKS}" on . "${TORSOCKS}" on
fi fi
#./torbrowser-windows.sh
../src/win/torbrowser-windows.sh ../src/win/torbrowser-windows.sh
version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")" version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
. "${TORSOCKS}" off . "${TORSOCKS}" off

View File

@@ -1 +1 @@
!define I2P_VERSION 1.9.7 !define I2P_VERSION 2.1.0

View File

@@ -1,3 +1,3 @@
!define VERSIONMAJOR 1 !define VERSIONMAJOR 2
!define VERSIONMINOR 9 !define VERSIONMINOR 1
!define VERSIONBUILD 7 !define VERSIONBUILD 0