diff options
author | Daniel Friesel <derf@derf.homelinux.org> | 2009-04-10 20:57:05 +0200 |
---|---|---|
committer | Daniel Friesel <derf@derf.homelinux.org> | 2009-04-10 20:57:05 +0200 |
commit | 86f2151b6fd877061408743bac30b52d48cfee31 (patch) | |
tree | 0a3bbc996ff9787d1618b0c5f513d63787b29321 /include/bootstrap | |
parent | c0bcbda3d5536650fff9fdca5b4a9f3ec20ba288 (diff) |
bootstrap: Fixed a bug with $PDIR, custom PDIR should work now
Diffstat (limited to 'include/bootstrap')
-rwxr-xr-x | include/bootstrap | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/bootstrap b/include/bootstrap index 00c5db6..2dbeb4a 100755 --- a/include/bootstrap +++ b/include/bootstrap @@ -6,17 +6,17 @@ # and also have an excuse for using zsh here :P typeset -i rcempty=0 -typeset PKG_ROOT PKG_PATH default_path='~/packages' +typeset PKG_ROOT PDIR default_path='~/packages' if [[ -n $1 ]] { PKG_ROOT=$1 - PKG_PATH=${~${2-$default_path}} + PDIR=${~${2-$default_path}} } else { cat <<- meow - Usage: ./bootstrap PKG_ROOT [PKG_PATH] + Usage: ./bootstrap PKG_ROOT [PDIR] PKG_ROOT is an URI, either of the form proto://host/path, or just /path Note: The path must be absolute, it may not contain a literal ~ - PKG_PATH is the path where pkg and all further packages will be installed, + PDIR is the path where pkg and all further packages will be installed, by default $default_path meow exit 100 @@ -34,7 +34,7 @@ if ! [[ -e ~/.zshrc ]] { echo 'Creating the basic directory structure' mkdir -p ~/bin path=(~/bin $path) -mkdir -p $PKG_PATH/.collected/man/man{1..8} +mkdir -p $PDIR/.collected/man/man{1..8} if ! which git &> /dev/null; then echo 'It appears that git is not available on this system.' @@ -43,13 +43,13 @@ if ! which git &> /dev/null; then fi echo 'Fetching the core package...' -cd $PKG_PATH +cd $PDIR git clone $PKG_ROOT/core cd core || exit 1 echo 'Writing pkg.conf' echo "PKG_ROOT='$PKG_ROOT'" > ~/.pkg.conf -echo "PKG_PATH=\"${PKG_PATH/$HOME/\$HOME}\"" >> ~/.pkg.conf +echo "PDIR=\"${PDIR/$HOME/\$HOME}\"" >> ~/.pkg.conf echo 'Installing core package' rehash |