Skip to content

Commit

Permalink
Merge pull request #23 from Silex/master
Browse files Browse the repository at this point in the history
Avoid fetchurl / build.sh name collisions
  • Loading branch information
zimbatm committed Nov 25, 2013
2 parents 5657d16 + ae01834 commit 074f0b9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fetchurl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CACHE=${CACHE:-1}
UNPACK=${UNPACK:-1}
VERBOSE=${VERBOSE:-0}

TARGET_DIR=${TARGET_DIR:-`pwd`}
EXTRACT_DIR=${EXTRACT_DIR:-`pwd`}
if [ -n "$HOME" ]; then
CACHE_DIR=${CACHE_DIR:-$HOME/.cache/fetchurl}
else
Expand Down Expand Up @@ -51,7 +51,7 @@ usage() {
echo "UNPACK=${UNPACK}"
echo "VERBOSE=${VERBOSE}"

echo "TARGET_DIR=${TARGET_DIR}"
echo "EXTRACT_DIR=${EXTRACT_DIR}"
echo "CACHE_DIR=${CACHE_DIR}"
echo "TMP_DIR=${TMP_DIR}"

Expand Down Expand Up @@ -98,7 +98,7 @@ if [ "$UNPACK" -ne 0 ]; then
exit 1
fi

target_dir=`expand_path "$TARGET_DIR"`
target_dir=`expand_path "$EXTRACT_DIR"`
mkdir -p "$target_dir"
sh cd "$target_dir"

Expand Down

0 comments on commit 074f0b9

Please sign in to comment.