From c0dc4c3a44c561095608643c320f18be1ac0f1cc Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Sat, 11 May 2024 18:52:45 -0300 Subject: [PATCH] Print errors with [x] rather than [-] --- bin/setup-srczap | 2 +- bin/srczap | 2 +- libexec/srczap/srczap-clone | 6 +++--- libexec/srczap/srczap-erase | 2 +- libexec/srczap/srczap-pull | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/setup-srczap b/bin/setup-srczap index 59418ef..f876b13 100755 --- a/bin/setup-srczap +++ b/bin/setup-srczap @@ -10,7 +10,7 @@ doas="${localbase}"/etc/doas.conf ## # main if [ "$(id -u)" != "0" ]; then - echo "[-] This command must be run by root" + echo "[x] This command must be run by root" exit 1 fi diff --git a/bin/srczap b/bin/srczap index 82a4cf4..3ee1318 100755 --- a/bin/srczap +++ b/bin/srczap @@ -17,7 +17,7 @@ require_dependency() { deps=$1 for dep in $deps; do if ! which -s "$dep"; then - echo "[-] This command requires ${dep}, but ${dep} wasn't found" + echo "[x] This command requires ${dep}, but ${dep} wasn't found" exit 1 fi done diff --git a/libexec/srczap/srczap-clone b/libexec/srczap/srczap-clone index b1613f0..5bafcd1 100755 --- a/libexec/srczap/srczap-clone +++ b/libexec/srczap/srczap-clone @@ -22,13 +22,13 @@ gitexec() ## # main if ! "${libexec}"/issrczap-member; then - echo "[-] This command must be run by a member of the '_srczap' group" + echo "[x] This command must be run by a member of the '_srczap' group" exit 1 fi if [ -e "${gitdir}/.git" ]; then - echo "[-] ${gitdir} exists." - echo "[-] Try 'srczap pull'" + echo "[x] ${gitdir} exists." + echo "[x] Try 'srczap pull'" exit 1 fi diff --git a/libexec/srczap/srczap-erase b/libexec/srczap/srczap-erase index c05af98..5fe12dd 100644 --- a/libexec/srczap/srczap-erase +++ b/libexec/srczap/srczap-erase @@ -26,7 +26,7 @@ while true; do printf "[-] Nothing to do\n" exit else - printf "[-] '%s' is not a valid option.\n" "${r}" + printf "[x] '%s' is not a valid option.\n" "${r}" printf "[y|n] " fi done diff --git a/libexec/srczap/srczap-pull b/libexec/srczap/srczap-pull index 97a56fc..e5cf1dc 100755 --- a/libexec/srczap/srczap-pull +++ b/libexec/srczap/srczap-pull @@ -28,7 +28,7 @@ change_branch() if ! gitexec "checkout ${branch} > /dev/null 2>&1" || gitexec "checkout -t ${remote}/${branch} > /dev/null 2>&1"; then r="${?}" - echo "[-] 'git checkout' exited with an error" + echo "[x] 'git checkout' exited with an error" exit "${r}" else echo "[-] Done" @@ -39,14 +39,14 @@ change_branch() ## # main if ! "${libexec}"/issrczap-member; then - echo "[-] This command must be run by a member of the '_srczap' group" + echo "[x] This command must be run by a member of the '_srczap' group" exit 1 fi if [ ! -e "${gitdir}/.git" ]; then set +x - echo "[-] ${gitdir} is not a valid git repository." - echo "[-] Try 'srczap clone'" + echo "[x] ${gitdir} is not a valid git repository." + echo "[x] Try 'srczap clone'" exit 1 fi