work around makensis path issues

This commit is contained in:
idk
2023-04-19 01:16:51 +00:00
parent bc9b4a0250
commit 8894c946bc
2 changed files with 6 additions and 5 deletions

View File

@ -15,10 +15,10 @@ 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
#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

View File

@ -15,7 +15,8 @@ makensis(){
NSIS_PATH="/c/Program Files (x86)/NSIS/Bin"
PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
export PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
makensis $@
which makensis && makensis $@
which wsl && wsl makensis $@
}
if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then