summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-02-21 14:30:00 -0800
committerKeith Packard <keithp@keithp.com>2010-02-22 09:56:58 -0800
commitedd85bcd6bc92beaf266a602da76d2aefe836a8e (patch)
treecfb34302d546d9cea33d96c3633d7ba03230eba0
parent52cc3b03c3950cd66f9d976b2a3ae9f89dc4a97b (diff)
bin/mklib: Clear CDPATH to avoid damaging expand_archive output
The bash 'cd' command tends to emit random stuff to stdout when the CDPATH variable is set, so clear it to keep extra filenames from being emitted from the expand_archive function, which would otherwise cause mklib to fail. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Brian Paul <brianp@vmware.com>
-rwxr-xr-xbin/mklib4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/mklib b/bin/mklib
index 06e8029cb6..7f2272584e 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -25,6 +25,10 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# Clear CDPATH as the 'cd' command will echo stuff
+# to stdout if it is set
+unset CDPATH
+
# Given a list of files, look for .a archives and unpack them.
# Return the original list of files minus the .a files plus the unpacked files.
# first param: name of a temp directory (to be deleted when finished)