Commit: bd695a04cf799a4c51c9f193dfc35777005c999f Parent: a7019fa6002b0cf376dc99e7d8a1ef711704d8d3 Author: Johannes Thyssen Tishman Date: Tue, 9 Apr 2024 22:05:02 +0000 Improve error handling and printf format Diffstat: M Makefile | 21 +++++++++++---------- M _scripts/setup_repo | 4 +--- 2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile @@ -4,7 +4,7 @@ REPOS = ${HOME}/repos all: general repos dotfiles packages general: - @printf 'General setup... ' + @printf 'General setup...\n' doas sed -i '/google/d' /etc/ntpd.conf doas rcctl set apmd flags -A -Z 5 grep 'kern.audio' /etc/sysctl.conf \ @@ -12,31 +12,32 @@ general: grep 'kern.video' /etc/sysctl.conf \ || echo 'kern.video.record=1' | doas tee -a /etc/sysctl.conf [ ! -f '/etc/doas.conf' ] \ - && echo 'permit nopass keepenv :wheel' | doas tee /etc/doas.conf + && echo 'permit nopass keepenv :wheel' | doas tee /etc/doas.conf \ + || true mkdir -p ${HOME}/{.local/bin,.config} rm -f ${HOME}/{.cvsrc,.cshrc,.login,.profile,.mailrc,.Xdefaults} @printf 'done\n' repos: - @printf 'Cloning personal repositories... ' - ${SCRIPTS}/setup_repo "${REPOS}" dwm - ${SCRIPTS}/setup_repo "${REPOS}" dmenu - ${SCRIPTS}/setup_repo "${REPOS}" dotfiles - ${SCRIPTS}/setup_repo "${REPOS}" scripts "${HOME}/.local/bin" + @printf 'Cloning personal repositories...\n' + -${SCRIPTS}/setup_repo "${REPOS}" dwm + -${SCRIPTS}/setup_repo "${REPOS}" dmenu + -${SCRIPTS}/setup_repo "${REPOS}" dotfiles + -${SCRIPTS}/setup_repo "${REPOS}" scripts "${HOME}/.local/bin" @printf 'done\n' dotfiles: repos - @printf 'Linking dotfiles... ' + @printf 'Linking dotfiles...\n' cd "${REPOS}/dotfiles/main" && make link @printf 'done\n' packages: dotfiles - @printf 'Installing essential packages... ' + @printf 'Installing essential packages...\n' doas pkg_add -l ${REPOS}/dotfiles/main/pkgs @printf 'done\n' gnupg: - @printf 'Importing GnuPG keys... ' + @printf 'Importing GnuPG keys...\n' doas pkg_add gnupg ${SCRIPTS}/setup_gpg @printf 'done\n' diff --git a/_scripts/setup_repo b/_scripts/setup_repo @@ -8,9 +8,7 @@ BARE="${DIR}.git" command -v got > /dev/null \ || { printf '%s: got is not installed\n' "$0" && exit 1; } -mkdir -p "$DST" - -mkdir "$DIR" +mkdir -p "$DIR" got clone "ssh://anon@${REMOTE}/${2}" "${BARE}.git" got checkout "${BARE}.git" "${3:-${DIR}/main}" sed -i 's/anon@//' "${BARE}.git/got.conf"