work around makensis path issues
This commit is contained in:
@@ -15,11 +15,6 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
|
||||
. "$SCRIPT_DIR/config_override.sh"
|
||||
fi
|
||||
|
||||
#MAKENSIS=$(which makensis)
|
||||
#if [ -z "$MAKENSIS" ]; then
|
||||
# MAKENSIS="wsl makensis"
|
||||
#fi
|
||||
|
||||
cp "$SCRIPT_DIR"/src/nsis/*.nsi "$SCRIPT_DIR"/build
|
||||
cp "$SCRIPT_DIR"/src/nsis/*.nsh "$SCRIPT_DIR"/build
|
||||
cp "$SCRIPT_DIR"/src/icons/*.ico "$SCRIPT_DIR"/build
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
uname=$(uname)
|
||||
|
||||
NSIS_PATH="/c/Program Files (x86)/NSIS/Bin"
|
||||
PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
|
||||
export PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
|
||||
|
||||
wget(){
|
||||
which wget && wget $@
|
||||
which powershell && powershell Invoke-WebRequest $@
|
||||
}
|
||||
|
||||
makensis(){
|
||||
which makensis && makensis $@
|
||||
NSIS_PATH="/c/Program Files (x86)/NSIS/Bin"
|
||||
PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
|
||||
export PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
|
||||
which makensis && makensis $@
|
||||
which wsl && wsl makensis $@
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user