dot/dots
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support --verbose to get feedback from Stow and Git

Browse source
This commit is contained in:
Danielle McLean 2023-12-05 21:26:38 +11:00
parent 136eddf8dd
commit 1ef91ce5f2
Signed by: 00dani
GPG key ID: 52C059C3B22A753E
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dot-local/bin/dots
View file

@ -15,6 +15,14 @@ supported_stow_versions=(
2.3.2-fixbug56727 2.3.2-fixbug56727
) )
call-git() {
git $argv ${VERBOSE:+-v}
}
call-gnu-stow() {
$STOW --dotfiles -d $DOTFILES -t ~ --ignore=${^global_ignore} ${VERBOSE:+-vvv} $argv
}
do-bootstrap() { do-bootstrap() {
echo 'Bootstrapping your dotfiles...' >&2 echo 'Bootstrapping your dotfiles...' >&2
mkdir -p $DOTFILES mkdir -p $DOTFILES
@ -62,11 +70,7 @@ clone-one() {
return 1 return 1
fi fi
echo "Retrieving $package from $url now..." >&2 echo "Retrieving $package from $url now..." >&2
git clone $url $DOTFILES/$package call-git clone $url $DOTFILES/$package
}
call-gnu-stow() {
$STOW --dotfiles -d $DOTFILES -t ~ --ignore=${^global_ignore} $argv
} }
do-stow() { do-stow() {
@ -138,7 +142,7 @@ do-fetch() {
(( $#packages == 0 )) && packages=( $DOTFILES/*(N:t) ) (( $#packages == 0 )) && packages=( $DOTFILES/*(N:t) )
for p in $packages; do for p in $packages; do
cd $DOTFILES/$p cd $DOTFILES/$p
git fetch -p || return $? call-git fetch -p || return $?
done done
} }
@ -148,7 +152,7 @@ do-pull() {
(( $#packages == 0 )) && packages=( $DOTFILES/*(N:t) ) (( $#packages == 0 )) && packages=( $DOTFILES/*(N:t) )
for p in $packages; do for p in $packages; do
cd $DOTFILES/$p cd $DOTFILES/$p
git pull || return $? call-git pull || return $?
done done
} }
@ -164,7 +168,7 @@ do-status() {
printf %${length}s' ' $p printf %${length}s' ' $p
# Check if the package is actually a repo. It might not be if it's brand-new. # Check if the package is actually a repo. It might not be if it's brand-new.
git_status="$(git status --porcelain --ignore-submodules -unormal 2>/dev/null)" git_status="$(call-git status --porcelain --ignore-submodules -unormal 2>/dev/null)"
if (( $? != 0 )); then if (( $? != 0 )); then
printf '%9s' '' # space across to the last column printf '%9s' '' # space across to the last column
print -P %F{247}not a git repository%f print -P %F{247}not a git repository%f
@ -197,6 +201,12 @@ do-status() {
main() { main() {
: ${DOTFILES:=~/dotfiles} ${STOW:=stow} ${DOTS_SOURCE_PREFIX:=https://git.00dani.me/dot} : ${DOTFILES:=~/dotfiles} ${STOW:=stow} ${DOTS_SOURCE_PREFIX:=https://git.00dani.me/dot}
local opt_index=$argv[(I)(-v|--verbose)]
if (( opt_index != 0 )); then
VERBOSE=yes
argv[opt_index]=()
fi
comm=$1 comm=$1
if (( $# == 0 )); then if (( $# == 0 )); then
if [[ -d $DOTFILES ]]; then if [[ -d $DOTFILES ]]; then