From c56fc669660e3d80130bba61ae564b64d28c1fdc Mon Sep 17 00:00:00 2001 From: Andrew Rogers Date: Mon, 9 Oct 2023 03:02:49 -0500 Subject: [PATCH] make-lsp: Fix quoting on -C and -f, JSON dir fix --- scripts/make-lsp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/make-lsp b/scripts/make-lsp index d5ee6b3..2c77235 100755 --- a/scripts/make-lsp +++ b/scripts/make-lsp @@ -24,7 +24,7 @@ OPTIONS EOU MAKEFILE='' -MAKEDIR='' +MAKEDIR='.' DEBUG=0 while getopts 'hdC:f:' opt; do @@ -36,10 +36,10 @@ while getopts 'hdC:f:' opt; do DEBUG=1 ;; C) - MAKEDIR="-C'$OPTARG'" + MAKEDIR="$OPTARG" ;; f) - MAKEFILE="--file='$OPTARG'" + MAKEFILE="--file=$OPTARG" ;; esac done @@ -50,7 +50,7 @@ COMPILER_RX='^\s*cc|^\s*cxx|^\s*c\+\+|^\s*gcc|^\s*g\+\+|^\s*clang|^\s*clang\+\+' [ "$DEBUG" -ne 0 ] && set -x -make "$MAKEDIR" "$MAKEFILE" --always-make --dry-run ${@} \ +make "-C$MAKEDIR" "$MAKEFILE" --always-make --dry-run ${@} \ | grep -E "$COMPILER_RX" \ | grep -w '\-c' \ - | jq -nR '[inputs|{directory:".", command:., file: match(" [^ ]+$").string[1:]}]' + | jq -nR '[inputs|{directory:"'"$MAKEDIR"'", command:., file: match(" [^ ]+$").string[1:]}]'