Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
d7544ced5f | |||
ec44c0f6e3 | |||
10fe05066c |
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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"
|
||||
|
Reference in New Issue
Block a user