Merge pull request #79 from thought-machine/fix-sh-binary-bug-2

Fix sh binary bug 2
thought-machine · May 9, 2016 · 5e5af85 · 5e5af85
2 parents 55deaa1 + d0a2e43
commit 5e5af85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Version 2.1.2
+-------------
+    * Fixes one more bug with sh_binary where paths were taken to be relative when they were absolute.
+
 Version 2.1.1
 -------------
     * Fixes bug with sh_binary not ignoring the main script properly when generating the tarball.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.1
+2.1.2
diff --git a/src/parse/rules/sh_rules.py b/src/parse/rules/sh_rules.py
@@ -69,7 +69,7 @@ def sh_binary(name, main, deps=None, visibility=None):
         # Inject the tar ball boundary.
         'echo "%s" >> $OUT' % (_SH_BINARY_TMPL_SUFFIX % tmpl_vars),
         # Compress the dependent files and dump out into the bash script.
-        'find $TMP_DIR -type f | grep -v $SRCS | grep -v $OUT | sed "s/^\.\///g" | tar zc -f - --files-from - >> $OUT',
+        'find . -type f | grep -v $SRCS | grep -v $(echo $OUT | sed "s/$TMP_DIR//g") | sed "s/^\.\///g" | tar zc -f - --files-from - >> $OUT',
     ])
 
     build_rule(