Permalink
Browse files

Bug 836097 - use absolute paths throughout for clarity - r=bustage

  • Loading branch information...
1 parent 8703495 commit 462a05bcd3fe213d62c834613e132c6762caacf6 @ccooper ccooper committed Apr 25, 2013
Showing with 6 additions and 5 deletions.
  1. +6 −5 scripts/hsts/update_hsts_preload_list.sh
@@ -41,6 +41,7 @@ DIFF="diff -up"
PRELOAD_SCRIPT="getHSTSPreloadList.js"
PRELOAD_ERRORS="nsSTSPreloadList.errors"
PRELOAD_INC="nsSTSPreloadList.inc"
+BASEDIR=`pwd`
while [ $# -gt 0 ]; do
case "$1" in
@@ -123,15 +124,15 @@ compare_preload_lists()
${UNPACK_CMD} ${BROWSER_ARCHIVE}
mkdir tests && cd tests
${UNZIP} ../${TESTS_ARCHIVE}
- cd ..
+ cd ${BASEDIR}
cp tests/bin/xpcshell ${PRODUCT}
# Run the script to get an updated preload list.
echo "INFO: Generating new HSTS preload list..."
- cd ${PRODUCT}
+ cd ${PRODUCT}
rm -rf ${PRELOAD_ERRORS}
- echo INFO: Running \"LD_LIBRARY_PATH=. ./xpcshell ../${PRELOAD_SCRIPT} ${PWD}/${PRELOAD_INC}\"
- LD_LIBRARY_PATH=. ./xpcshell ../${PRELOAD_SCRIPT} ${PWD}/${PRELOAD_INC}
+ echo INFO: Running \"LD_LIBRARY_PATH=. ./xpcshell ${BASEDIR}/${PRELOAD_SCRIPT} ${BASEDIR}/${PRELOAD_INC}\"
+ LD_LIBRARY_PATH=. ./xpcshell ${BASEDIR}/${PRELOAD_SCRIPT} ${BASEDIR}/${PRELOAD_INC}
# The created files should be non-empty.
echo "INFO: Checking whether new HSTS preload list is valid..."
@@ -142,7 +143,7 @@ compare_preload_lists()
echo "New HSTS preload list is empty. That's less good."
exit 1
fi
- cd ..
+ cd ${BASEDIR}
# Check for differences
echo "INFO: diffing old/new HSTS preload lists..."

0 comments on commit 462a05b

Please sign in to comment.