From 32a6d7a369207525275521a9d0a404eb02fd7fb2 Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Sat, 11 May 2024 23:55:58 -0300 Subject: [PATCH] sourcezap erase -> sourcezap rm --- README.md | 4 ++-- bin/sourcezap | 6 +++--- libexec/sourcezap/{sourcezap-erase => sourcezap-rm} | 6 +++--- man/man8/sourcezap.8 | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename libexec/sourcezap/{sourcezap-erase => sourcezap-rm} (82%) diff --git a/README.md b/README.md index e4a170a..80a2d64 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ the first time: # This command requires root privileges # sourcezap install - # Start over: erase /usr/src/ and /home/_sourcezap/src/ + # Remove the contents of /usr/src/ and /home/_sourcezap/src/ # This command requires root privileges - $ sourcezap erase + $ sourcezap rm ### ENVIRONMENT diff --git a/bin/sourcezap b/bin/sourcezap index 908332c..ff5a49f 100755 --- a/bin/sourcezap +++ b/bin/sourcezap @@ -50,8 +50,8 @@ case $1 in require_dependency "git doas" "${libexec}"/sourcezap-checkout "${gitdir}" "${2}" ;; - "erase") - "${libexec}"/sourcezap-erase "${gitdir}" "${installdir}" + "rm") + "${libexec}"/sourcezap-rm "${gitdir}" "${installdir}" ;; "install") require_dependency "git doas" @@ -65,6 +65,6 @@ case $1 in printf " pull Pull source tree updates\n" printf " checkout Checkout a branch other than the default\n" printf " install Install the source tree into /usr/src/\n" - printf " erase Erase /usr/src/ and /home/_sourcezap/src/\n" + printf " rm Remove /usr/src/ and /home/_sourcezap/src/\n" ;; esac diff --git a/libexec/sourcezap/sourcezap-erase b/libexec/sourcezap/sourcezap-rm similarity index 82% rename from libexec/sourcezap/sourcezap-erase rename to libexec/sourcezap/sourcezap-rm index 721ef14..33749c8 100644 --- a/libexec/sourcezap/sourcezap-erase +++ b/libexec/sourcezap/sourcezap-rm @@ -29,9 +29,9 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi -printf "1 Erase %s\n" "${gitdir}" -printf "2 Erase %s\n" "${installdir}" -printf "3 Erase both (%s and %s)\n" "${gitdir}" "${installdir}" +printf "1 Remove the contents of %s\n" "${gitdir}" +printf "2 Remove the contents of %s\n" "${installdir}" +printf "3 Remove the contents of both (%s and %s)\n" "${gitdir}" "${installdir}" printf "4 Do nothing\n" printf "1-4: " while true; do diff --git a/man/man8/sourcezap.8 b/man/man8/sourcezap.8 index 82b5a50..05760ec 100644 --- a/man/man8/sourcezap.8 +++ b/man/man8/sourcezap.8 @@ -14,7 +14,7 @@ sourcezap checkout .br sourcezap install .br -sourcezap erase +sourcezap rm .Sh DESCRIPTION .Nm sourcezap manages a copy of the HardenedBSD source tree. @@ -48,9 +48,9 @@ Install /home/_sourcezap/src/ into /usr/src/. .br This command requires root privileges. .Pp -.Nm sourcezap erase +.Nm sourcezap rm .br -Start over: erase /usr/src/ and /home/_sourcezap/src/. +Remove the contents of /usr/src/ and /home/_sourcezap/src/. .br This command requires root privileges. .br