From da8210b947821b2002ce7dfb34eba213a2da73a3 Mon Sep 17 00:00:00 2001
From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Sun, 29 Dec 2013 21:11:57 +0200
Subject: [PATCH 1/1] Fix handling spaces in directory name

---
 tests/site_scons/site_tools/nanopb.py | 4 ++--
 tools/make_linux_package.sh           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/site_scons/site_tools/nanopb.py b/tests/site_scons/site_tools/nanopb.py
index 0ed70464..97837666 100644
--- a/tests/site_scons/site_tools/nanopb.py
+++ b/tests/site_scons/site_tools/nanopb.py
@@ -61,12 +61,12 @@ def _detect_protoc(env):
     p1 = os.path.join(p, 'generator-bin', 'protoc')
     if os.path.exists(p1):
         # Use protoc bundled with binary package
-        return p1
+        return env['ESCAPE'](p1)
     
     p = env.WhereIs('protoc')
     if p:
         # Use protoc from path
-        return p
+        return env['ESCAPE'](p)
     
     raise SCons.Errors.StopError(NanopbWarning,
         "Could not find the protoc compiler")
diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index 1cbf478d..332c281b 100755
--- a/tools/make_linux_package.sh
+++ b/tools/make_linux_package.sh
@@ -34,10 +34,10 @@ LIBPROTOC=$(ldd `which protoc` | grep -o '/.*libprotoc[^ ]*')
 cp $LIBPROTOC $DEST/generator-bin/
 cat > $DEST/generator-bin/protoc << EOF
 #!/bin/bash
-SCRIPTDIR=\$(dirname \$(readlink -f \$0))
+SCRIPTDIR=\$(dirname "\$0")
 export LD_LIBRARY_PATH=\$SCRIPTDIR
 export PATH=\$SCRIPTDIR:\$PATH
-exec \$SCRIPTDIR/protoc.bin "\$@"
+exec "\$SCRIPTDIR/protoc.bin" "\$@"
 EOF
 chmod +x $DEST/generator-bin/protoc
 
-- 
2.16.6