summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Jennings <craigmartinjennings@gmail.com>2023-10-23 06:11:29 -0500
committerCraig Jennings <craigmartinjennings@gmail.com>2023-10-23 06:13:05 -0500
commit4573a9197db85f5b8288b627eaced229adb06843 (patch)
tree28bd77eb796966c9d5f223b2514af775071cabef
parent9e8c15466b229ad0f524eb9a167472b3ea34f75a (diff)
adding --recurse-submodules on emacs clone; cosmetic cleanup
-rwxr-xr-xarchsetup12
1 files changed, 6 insertions, 6 deletions
diff --git a/archsetup b/archsetup
index d2f2f31..bb2f4d0 100755
--- a/archsetup
+++ b/archsetup
@@ -34,8 +34,8 @@ dotfiles_repo="https://git.cjennings.net/dotfiles"
dotemacs_repo="https://git.cjennings.net/dotemacs.git"
dotfiles_home="/home/$username/.dotfiles"
-logfile="/var/log/archsetup-$(date +'%Y-%m-%d-%H-%M-%S').log" # logfile location
-source_dir="/home/$username/.local/src" # aur/git source goes here
+logfile="/var/log/archsetup-$(date +'%Y-%m-%d-%H-%M-%S').log"
+source_dir="/home/$username/.local/src" # aur/git source goes here
packages_before="/var/log/archsetup-preexisting-package-list.txt"
packages_after="/var/log/archsetup-post-install-package-list.txt"
archsetup_packages="/var/log/archsetup-installed-packages.txt"
@@ -61,7 +61,7 @@ intro() {
error () {
# $1 = type ERROR, noted but the script will continue to run.
# anything else will produce CRASH, which halts the script
- # $2 = what was happening (e.g., "adding $username to group $groupname", etc.)
+ # $2 = what was happening (e.g., "adding $username to group $groupname")
# $3 = the error code (i.e., "$?")
errors_encountered=$((errors_encountered+1))
@@ -72,7 +72,7 @@ error () {
return 1;
;;
*)
- printf "CRASH: %s failed with error code: %s @ %s. Script halted.\n" \
+ printf "CRASH: %s failed with error: %s @ %s. Script halted.\n" \
"$2" "$3" "$(date +'%T')" | tee -a "$logfile"
exit 1;
;;
@@ -662,8 +662,8 @@ developer_workstation () {
pacman_install rlwrap # adds readline support to programs (SBCL-related)
action="setting up emacs configuration files" && display "task" "$action"
- (sudo -u "$username" git clone $dotemacs_repo /home/$username/.emacs.d >> "$logfile" 2>&1) || \
- error "error" "$action" "$?"
+ (sudo -u "$username" git clone --recurse-submodules $dotemacs_repo /home/$username/.emacs.d >> \
+ "$logfile" 2>&1) || error "error" "$action" "$?"
action="DevOps Utilities" && display "subtitle" "$action"