From 75aeebd3b2a2eae229f3a0bedc5bc330bfece183 Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Wed, 22 Jun 2005 00:32:16 +0000 Subject: [PATCH] Leverage -C command line flag when calling the mar executable to avoid need to "cd" into $workdir. This allows us to locate the mar executable using a relative file path, which is a good thing since $PWD is sometimes not set correctly on the tinderbox systems. (This patch is based on discussion with Chase over IRC.) git-svn-id: svn://10.0.0.236/trunk@174975 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/update-packaging/Makefile.in | 2 +- mozilla/tools/update-packaging/make_full_update.sh | 2 +- mozilla/tools/update-packaging/make_incremental_update.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/tools/update-packaging/Makefile.in b/mozilla/tools/update-packaging/Makefile.in index 8410893759d..abad2902bac 100644 --- a/mozilla/tools/update-packaging/Makefile.in +++ b/mozilla/tools/update-packaging/Makefile.in @@ -48,6 +48,6 @@ STAGE_DIR = $(DIST)/update full-update:: mkdir -p $(STAGE_DIR) - MAR=$(PWD)/$(DIST)/host/bin/mar $(srcdir)/make_full_update.sh $(STAGE_DIR)/update.mar $(DIST)/bin + MAR=$(DIST)/host/bin/mar $(srcdir)/make_full_update.sh $(STAGE_DIR)/update.mar $(DIST)/bin include $(topsrcdir)/config/rules.mk diff --git a/mozilla/tools/update-packaging/make_full_update.sh b/mozilla/tools/update-packaging/make_full_update.sh index de1df19e3e0..788ca56cd37 100755 --- a/mozilla/tools/update-packaging/make_full_update.sh +++ b/mozilla/tools/update-packaging/make_full_update.sh @@ -76,7 +76,7 @@ done $BZIP2 -z9 "$manifest" && mv -f "$manifest.bz2" "$manifest" -(cd "$workdir" && eval "$MAR -c output.mar $targetfiles") +eval "$MAR -C \"$workdir\" -c output.mar $targetfiles" mv -f "$workdir/output.mar" "$archive" # cleanup diff --git a/mozilla/tools/update-packaging/make_incremental_update.sh b/mozilla/tools/update-packaging/make_incremental_update.sh index 307619f639f..6060dd4f172 100755 --- a/mozilla/tools/update-packaging/make_incremental_update.sh +++ b/mozilla/tools/update-packaging/make_incremental_update.sh @@ -113,7 +113,7 @@ done $BZIP2 -z9 "$manifest" && mv -f "$manifest.bz2" "$manifest" -(cd "$workdir" && eval "$MAR -c output.mar $archivefiles") +eval "$MAR -C \"$workdir\" -c output.mar $archivefiles" mv -f "$workdir/output.mar" "$archive" # cleanup