Changeset 14701

Timestamp:

Mar 2, 2016, 4:31:16 PM (6 years ago)

Author:

mikedld

Message:

#6079: Fix miniupnpc script to handle spaces and other special chars in paths

File:

• trunk/third-party/miniupnp/updateminiupnpcstrings.sh (modified) (2 diffs)

trunk/third-party/miniupnp/updateminiupnpcstrings.sh

@@ -4 +4 @@
 #Â (c) 2009 Thomas Bernard
 
-VERSION_FILE=$1
-TEMPLATE_FILE=$2
-FILE=$3
-TMPFILE=$3.tmp
+VERSION_FILE="$1"
+TEMPLATE_FILE="$2"
+FILE="$3"
+TMPFILE="$3.tmp"
 
 # detecting the OS name and version
@@ -39 +39 @@
 
 echo "Detected OS [$OS_NAME] version [$OS_VERSION]"
-MINIUPNPC_VERSION=`cat ${VERSION_FILE}`
+MINIUPNPC_VERSION=`cat "${VERSION_FILE}"`
 echo "MiniUPnPc version [${MINIUPNPC_VERSION}]"
 
 EXPR="s|OS_STRING \".*\"|OS_STRING \"${OS_NAME}/${OS_VERSION}\"|"
 #echo $EXPR
-test -f ${FILE}.in
+test -f "${FILE}.in"
 echo "setting OS_STRING macro value to ${OS_NAME}/${OS_VERSION} in $FILE."
-sed -e "$EXPR" < $TEMPLATE_FILE > $TMPFILE
+sed -e "$EXPR" < "$TEMPLATE_FILE" > "$TMPFILE"
 
 EXPR="s|MINIUPNPC_VERSION_STRING \".*\"|MINIUPNPC_VERSION_STRING \"${MINIUPNPC_VERSION}\"|"
 echo "setting MINIUPNPC_VERSION_STRING macro value to ${MINIUPNPC_VERSION} in $FILE."
-sed -e "$EXPR" < $TMPFILE > $FILE
-rm $TMPFILE
+sed -e "$EXPR" < "$TMPFILE" > "$FILE"
+rm "$TMPFILE"