Compare commits

..

3 Commits

Author SHA1 Message Date
idk
d7544ced5f Remove redundant clean 2023-04-28 20:36:36 +00:00
idk
ec44c0f6e3 remove redundant clean 2023-04-28 20:35:34 +00:00
idk
10fe05066c use powershell before which wget in wget finder function 2023-04-24 16:28:29 +00:00
3 changed files with 6 additions and 3 deletions

View File

@ -10,7 +10,6 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
fi
export machine=unix
"$SCRIPT_DIR"/buildscripts/clean.sh
"$SCRIPT_DIR"/buildscripts/clean.sh
"$SCRIPT_DIR"/buildscripts/build.sh
cd "$SCRIPT_DIR/I2P" || exit 1

View File

@ -9,7 +9,6 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
. "$SCRIPT_DIR/config_override.sh"
fi
"$SCRIPT_DIR"/buildscripts/clean.sh
"$SCRIPT_DIR"/buildscripts/clean.sh
"$SCRIPT_DIR"/buildscripts/build.sh
cd "$SCRIPT_DIR/I2P" || exit 1

View File

@ -10,8 +10,8 @@ PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
export PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
wget(){
which wget && wget $@ && return
which powershell && powershell Invoke-WebRequest $@ && return
which wget && wget $@ && return
}
makensisi(){
@ -19,6 +19,11 @@ makensisi(){
which wsl && wsl makensis $@ && return
}
make(){
which make && make $@ && return
which wsl && wsl make $@ && return
}
if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
JAVA_HOME=$(java -XshowSettings:properties -version 2>&1 | findstr "java.home" | sed 's| java.home = ||g')
export JAVA_HOME="$JAVA_HOME"