Browse Source

Fix paths with spaces

Johannes Kreutz 3 years ago
parent
commit
1579eea63f

+ 6 - 6
trackpoint-app/thirdparty/lib3mf.sh

@@ -21,14 +21,14 @@ LIB3MF_REPO="https://github.com/3MFConsortium/lib3mf"
 
 CONFIG="-DLIB3MF_TESTS:BOOL=OFF"
 
-mkdir -p $BASEDIR
+mkdir -p "$BASEDIR"
 
-if [ -d $DEPLOYDIR ]; then
-  rm -rf $DEPLOYDIR
+if [ -d "$DEPLOYDIR" ]; then
+  rm -rf "$DEPLOYDIR"
 fi
-mkdir -p $DEPLOYDIR
+mkdir -p "$DEPLOYDIR"
 
-pushd $BASEDIR
+pushd "$BASEDIR"
 
 if [ -d "lib3mf" ]; then
   rm -rf "lib3mf"
@@ -37,7 +37,7 @@ fi
 git clone --depth 1 --branch $LIB3MF_TAG $LIB3MF_REPO
 pushd lib3mf
 
-cmake . -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR $CONFIG $OPTIONS
+cmake . -DCMAKE_INSTALL_PREFIX="$DEPLOYDIR" $CONFIG $OPTIONS
 cmake --build . --parallel $JOBS
 cmake --install .
 

+ 6 - 6
trackpoint-app/thirdparty/openscenegraph.sh

@@ -21,14 +21,14 @@ OPENSCENEGRAPH_REPO="https://github.com/openscenegraph/OpenSceneGraph"
 
 CONFIG="-DBUILD_OSG_EXAMPLES:BOOL=OFF -DBUILD_OSG_APPLICATIONS:BOOL=OFF -DOSG_TEXT_USE_FONTCONFIG:BOOL=OFF"
 
-mkdir -p $BASEDIR
+mkdir -p "$BASEDIR"
 
-if [ -d $DEPLOYDIR ]; then
-  rm -rf $DEPLOYDIR
+if [ -d "$DEPLOYDIR" ]; then
+  rm -rf "$DEPLOYDIR"
 fi
-mkdir -p $DEPLOYDIR
+mkdir -p "$DEPLOYDIR"
 
-pushd $BASEDIR
+pushd "$BASEDIR"
 
 if [ -d "OpenSceneGraph" ]; then
   rm -rf "OpenSceneGraph"
@@ -37,7 +37,7 @@ fi
 git clone --depth 1 --branch $OPENSCENEGRAPH_TAG $OPENSCENEGRAPH_REPO
 pushd OpenSceneGraph
 
-cmake . -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR $CONFIG $OPTIONS
+cmake . -DCMAKE_INSTALL_PREFIX="$DEPLOYDIR" $CONFIG $OPTIONS
 cmake --build . --parallel $JOBS
 cmake --install .
 

+ 6 - 6
trackpoint-app/thirdparty/qt.sh

@@ -21,14 +21,14 @@ QT_BUGFIX=0
 
 URL="https://download.qt.io/official_releases/qt/$QT_MAJOR.$QT_MINOR/$QT_MAJOR.$QT_MINOR.$QT_BUGFIX/single/qt-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_BUGFIX.tar.xz"
 
-mkdir -p $BASEDIR
+mkdir -p "$BASEDIR"
 
-if [ -d $DEPLOYDIR ]; then
-  rm -rf $DEPLOYDIR
+if [ -d "$DEPLOYDIR" ]; then
+  rm -rf "$DEPLOYDIR"
 fi
-mkdir -p $DEPLOYDIR
+mkdir -p "$DEPLOYDIR"
 
-pushd $BASEDIR
+pushd "$BASEDIR"
 
 if [ ! -f qt-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_BUGFIX.tar.xz ]; then
   wget $URL
@@ -41,7 +41,7 @@ fi
 tar -xf "qt-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_BUGFIX.tar.xz"
 pushd "qt-everywhere-src-$QT_MAJOR.$QT_MINOR.$QT_BUGFIX"
 
-./configure $OPTIONS -ltcg -optimize-size -no-pch -prefix $DEPLOYDIR -release -opensource -confirm-license \
+./configure $OPTIONS -ltcg -optimize-size -no-pch -prefix "$DEPLOYDIR" -release -opensource -confirm-license \
     -nomake examples -nomake tests -nomake tools \
     -skip qtscxml -skip qtwayland -skip qtdatavis3d -skip qtcharts \
     -skip qtquickcontrols2 -skip qtvirtualkeyboard -skip qtshadertools \