diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/bootstrap | 28 | ||||
| -rwxr-xr-x | include/newpackage | 2 | ||||
| -rwxr-xr-x | include/pkglist | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/include/bootstrap b/include/bootstrap index 07d8c4f..880fa13 100755 --- a/include/bootstrap +++ b/include/bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env zsh # bootstrap - populate a home with the most necessary scripts -# After running this, other packages can be installed using 'pkg' -# Note: Since pkg is written in zsh, this script also is. +# After running this, other packages can be installed using 'ct' +# Note: Since caretaker is written in zsh, this script also is. # This way, I don't have to check for zsh somewhere in the script, # and also have an excuse for using zsh here :P @@ -19,7 +19,7 @@ if [[ -n $1 ]] { 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 ~ - PKG_DIR is the path where pkg and all further packages will be installed, + PKG_DIR is the path where caretaker and all further packages will be installed, by default $default_path meow exit 100 @@ -45,25 +45,25 @@ if ! which git &> /dev/null; then exit 200 fi -echo 'Fetching the pkg package...' +echo 'Fetching the caretaker package...' cd $PKG_DIR -git clone $PKG_ROOT/pkg -cd pkg +git clone $PKG_ROOT/caretaker caretaker +cd caretaker -echo 'Writing pkg.conf' -mkdir -p $XDG_CONFIG_HOME/pkg -cat > $XDG_CONFIG_HOME/pkg/pkg.conf <<- flurbl +echo 'Writing caretaker.conf' +mkdir -p $XDG_CONFIG_HOME/caretaker +cat > $XDG_CONFIG_HOME/caretaker/caretaker.conf <<- flurbl PKG_ROOT='$PKG_ROOT' PKG_DIR="${PKG_DIR/$HOME/\$HOME}" flurbl -echo 'Installing pkg package' +echo 'Installing caretaker package' rehash bin/checklinks -bin/pkg eval populate_collected pkg -bin/pkg eval exec_hook pkg post-add +bin/ct eval populate_collected caretaker +bin/ct eval exec_hook caretaker post-add -bin/pkg update +bin/ct update if (( rcempty )) { echo 'Removing empty zshrc' @@ -73,6 +73,6 @@ if (( rcempty )) { if [[ $PATH != *$HOME/bin* ]] { cat <<- tac Note: You may need to change your PATH to include ~/bin, - otherwise certain parts of pkg will not work. + otherwise certain parts of caretaker will not work. tac } diff --git a/include/newpackage b/include/newpackage index 924da44..889adfd 100755 --- a/include/newpackage +++ b/include/newpackage @@ -11,7 +11,7 @@ while [[ $1 == --* ]] { shift } -[[ -r ~/.pkg.conf ]] && source ~/.pkg.conf +[[ -r ~/.caretaker.conf ]] && source ~/.caretaker.conf [[ -d $PKG_ROOT ]] || exit 1 cd $PKG_ROOT diff --git a/include/pkglist b/include/pkglist index 0986150..660036b 100755 --- a/include/pkglist +++ b/include/pkglist @@ -1,6 +1,6 @@ #!/usr/bin/env zsh ## on the PKG_HOST: list available packages -## used by pkg remote-update +## used by ct remote-update # the PKG_PATH (package root path) is given as first argument ($1) if [[ ! -d $1 ]] { |