dotfiles

commit 3a60b8ff1cbc682abb5afcfae70d2f5209a91810
parent 3acaad0e03061c0f9b9ada103d4685251bb335f6
Author: regexghost <dev@regexghost.com>
Date:   Fri, 10 Jul 2026 21:55:44 +0100

readlink -f in backup.sh, added cal to otherPrograms.sh as it's not included in debian util-linux

Diffstat:
M
apt-install.sh
 | 
2
+-
M
otherPrograms.sh
 | 
34
++++++++++++++++++++++++++++------
M
terminal-scripts/backup.sh
 | 
2
+-

3 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/apt-install.sh b/apt-install.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-sudo apt install curl wget golang xorg xinit x11-xserver-utils bluetooth unzip git firefox mpv vlc tar moc fasd fonts-roboto fonts-firacode figlet jq xcompmgr picom trash-cli ncdu pulsemixer feh moc-ffmpeg-plugin keepassxc-full fzf libnotify-bin dunst texinfo xmlstarlet duf gh tidy w3m bluetooth xclip wbritish wbritish-huge rsync pup rename ifuse libimobiledevice-utils chromium groff zathura zathura-pdf-poppler zathura-ps xdotool pulseaudio-module-bluetooth sqlite3
+sudo apt install curl wget golang xorg xinit x11-xserver-utils bluetooth unzip git firefox mpv vlc tar moc fasd fonts-roboto fonts-firacode figlet jq xcompmgr picom trash-cli ncdu pulsemixer feh moc-ffmpeg-plugin keepassxc-full fzf libnotify-bin dunst texinfo xmlstarlet duf gh tidy w3m bluetooth xclip wbritish wbritish-huge rsync pup rename ifuse libimobiledevice-utils chromium groff zathura zathura-pdf-poppler zathura-ps xdotool pulseaudio-module-bluetooth sqlite3 expect
diff --git a/otherPrograms.sh b/otherPrograms.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+cleanup () {
+	cd ..
+	read -p "Delete temp folder (y/N)? " yesOrNo
+	if [ "$yesOrNo" = "y" ] || [ "$yesOrNo" = "Y" ]; then
+		trash-put temp_programs/
+	fi
+}
+
+trap 'cleanup' EXIT
+
 set -e
 
 mkdir -p temp_programs
@@ -402,6 +412,21 @@ dragon () {
 	cd ..
 }
 
+cal () {
+	mkdir util-linux
+	cd util-linux
+	ver="$(curl "https://www.kernel.org/pub/linux/utils/util-linux/" | grep "v2." | tail -n 1 | cut -d "\"" -f 2 | tr -d "/" | tr -d "v")"
+	wget "https://www.kernel.org/pub/linux/utils/util-linux/v${ver}/util-linux-${ver}.tar.xz"
+	tar -xf *.xz
+	cd */
+	./configure --disable-all-programs --enable-cal
+	make
+	cp cal ~/.local/bin/cal
+
+	cd ..
+	cd ..
+}
+
 build () {
 	read -p "q to quit, s to skip (next: $1)" qToQuit
 	[ "$qToQuit" = "q" ] && exit
@@ -437,6 +462,7 @@ elif [ "$1" = "notmine" ]; then
 	build mepo
 	build fastfetch
 	build dragon
+	build cal
 	build retroarch
 	echo "done"
 elif [ "$1" = "jwm" ]; then
@@ -491,6 +517,8 @@ elif [ "$1" = "fastfetch" ]; then
 	fastfetch
 elif [ "$1" = "dragon" ]; then
 	dragon
+elif [ "$1" = "cal" ]; then
+	cal
 elif [ "$1" = "alpine" ]; then
 	alpine
 else
@@ -499,9 +527,3 @@ else
 	echo "\"notmine\" to install other programs"
 	exit
 fi
-
-cd ..
-read -p "Delete temp folder (y/N)? " yesOrNo
-if [ "$yesOrNo" = "y" ] || [ "$yesOrNo" = "Y" ]; then
-	trash-put temp_programs/
-fi
diff --git a/terminal-scripts/backup.sh b/terminal-scripts/backup.sh
@@ -6,7 +6,7 @@ BACKUP_FILE="$XDG_CONFIG_HOME/regexghost/backup.txt"
 BACKUP_LOCATION="$HOME/Downloads/BackupMount/MainBackup"
 
 if [ "$1" = "add" ]; then
-	[ -e "$2" ] && echo "$(pwd)${2}" | sed "s|$HOME||g" >> "$BACKUP_FILE"
+	[ -e "$2" ] && echo "$(readlink -f "$2")" | sed "s|$HOME||g" >> "$BACKUP_FILE"
 elif [ "$1" = "remove" ] || [ "$1" = "rm" ]; then
 	file="$(echo "$2" | sed "s|$HOME||g")"
 	if grep -q "^${file}\$" "$BACKUP_FILE"; then