changeset 259:c053f27652cd

More fixes for spaces in install or project directories.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 05 Feb 2020 21:09:48 -0800
parents 74a71a5499c9
children a282d08e0e7c
files plat/unix/update_tags.sh
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/plat/unix/update_tags.sh	Sun Jan 19 11:13:13 2020 +0800
+++ b/plat/unix/update_tags.sh	Wed Feb 05 21:09:48 2020 -0800
@@ -5,7 +5,7 @@
 PROG_NAME=$0
 CTAGS_EXE=ctags
 CTAGS_ARGS=
-CTAGS_ARG_QUOTED_LAST=
+CTAGS_OPT_FILE=
 TAGS_FILE=tags
 PROJECT_ROOT=
 LOG_FILE=
@@ -36,7 +36,6 @@
     echo ""
 }
 
-CTAGS_QUOTED_OPTIONS='--options=/dev/null'
 while getopts "h?e:x:t:p:l:L:s:o:O:P:cA" opt; do
     case $opt in
         h|\?)
@@ -71,7 +70,7 @@
             PAUSE_BEFORE_EXIT=1
             ;;
         o)
-            CTAGS_QUOTED_OPTIONS="--options=$OPTARG"
+            CTAGS_OPT_FILE="--options=$OPTARG"
             ;;
         O)
             CTAGS_ARGS="$CTAGS_ARGS $OPTARG"
@@ -122,18 +121,18 @@
             done > "${TAGS_FILE}.files"
         fi
         CTAGS_ARGS="${CTAGS_ARGS} -L"
-        CTAGS_ARG_QUOTED_LAST="${TAGS_FILE}.files"
+        CTAGS_ARG_LAST="${TAGS_FILE}.files"
     else
-        CTAGS_ARG_QUOTED_LAST="${PROJECT_ROOT}"
+        CTAGS_ARG_LAST="${PROJECT_ROOT}"
     fi
 
     echo "Running ctags on whole project"
-    echo "$CTAGS_EXE -f \"$TAGS_FILE.temp\" $CTAGS_ARGS \"$CTAGS_ARG_QUOTED_LAST\""
-    "$CTAGS_EXE" -f "$TAGS_FILE.temp" $CTAGS_ARGS "$CTAGS_QUOTED_OPTIONS" "$CTAGS_ARG_QUOTED_LAST"
+    echo "$CTAGS_EXE -f \"$TAGS_FILE.temp\" \"$CTAGS_OPT_FILE\" $CTAGS_ARGS \"$CTAGS_ARG_LAST\""
+    "$CTAGS_EXE" -f "$TAGS_FILE.temp" "$CTAGS_OPT_FILE" $CTAGS_ARGS "$CTAGS_ARG_LAST"
 else
     echo "Running ctags on \"$UPDATED_SOURCE\""
-    echo "$CTAGS_EXE -f \"$TAGS_FILE.temp\" $CTAGS_ARGS --append \"$UPDATED_SOURCE\""
-    "$CTAGS_EXE" -f "$TAGS_FILE.temp" $CTAGS_ARGS "$CTAGS_QUOTED_OPTIONS" --append "$UPDATED_SOURCE"
+    echo "$CTAGS_EXE -f \"$TAGS_FILE.temp\" \"$CTAGS_OPT_FILE\" $CTAGS_ARGS --append \"$UPDATED_SOURCE\""
+    "$CTAGS_EXE" -f "$TAGS_FILE.temp" "$CTAGS_OPT_FILE" $CTAGS_ARGS --append "$UPDATED_SOURCE"
 fi
 
 if [ "$POST_PROCESS_CMD" != "" ]; then