diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/bootstrap | 14 | ||||
| -rwxr-xr-x | include/newpackage | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/bootstrap b/include/bootstrap index 2dbeb4a..793c6f3 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 PDIR default_path='~/packages' +typeset PKG_ROOT PKG_DIR default_path='~/packages' if [[ -n $1 ]] { PKG_ROOT=$1 - PDIR=${~${2-$default_path}} + PKG_DIR=${~${2-$default_path}} } else { cat <<- meow - Usage: ./bootstrap PKG_ROOT [PDIR] + Usage: ./bootstrap PKG_ROOT [PKG_DIR] 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 ~ - PDIR is the path where pkg and all further packages will be installed, + PKG_DIR 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 $PDIR/.collected/man/man{1..8} +mkdir -p $PKG_DIR/.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 $PDIR +cd $PKG_DIR git clone $PKG_ROOT/core cd core || exit 1 echo 'Writing pkg.conf' echo "PKG_ROOT='$PKG_ROOT'" > ~/.pkg.conf -echo "PDIR=\"${PDIR/$HOME/\$HOME}\"" >> ~/.pkg.conf +echo "PKG_DIR=\"${PKG_DIR/$HOME/\$HOME}\"" >> ~/.pkg.conf echo 'Installing core package' rehash diff --git a/include/newpackage b/include/newpackage index ebba174..924da44 100755 --- a/include/newpackage +++ b/include/newpackage @@ -28,7 +28,7 @@ if ((bare)) { git config receive.denyCurrentBranch ignore } -cd ${PDIR-~/packages} +cd ${PKG_DIR-~/packages} mkdir $package cd $package git init |