Updates progs

4 files changed, 10 insertions, 8 deletions

diff --git a/public/progs.csv b/public/progs.csv
index de53e35..c82c12b 100644
--- a/public/progs.csv
+++ b/public/progs.csv
@@ -44,6 +44,7 @@ R,cronie,is a cronjob manager to set up automatic mail syncing.
 A,gtk-theme-arc-gruvbox-git,gives the dark GTK theme used in LARBS.
 A,htop-vim,is a graphical and colorful system monitor.
 ,hugo,is a fastest framework for building websites.
+,imagemagick,is an image viewing/manipulation program.
 A,kakaotalk,is a messenger for Korean.
 ,lazygit,manages git in Neovim.
 A,lf-bin,is an extensive terminal file manager that everyone likes.
diff --git a/public/thesiah.sh b/public/thesiah.sh
index 7a49c66..48b7e2b 100755
--- a/public/thesiah.sh
+++ b/public/thesiah.sh
@@ -76,7 +76,7 @@ adduserandpass() {
 	# Adds user `$name` with password $pass1.
 	whiptail --infobox "Adding user \"$name\"..." 7 50
 	useradd -m -g wheel -s /bin/zsh "$name" >/dev/null 2>&1 ||
-		usermod -a -G wheel "$name" && mkdir -p /home/"$name"/{.config,Documents,Downloads,Music,Pictures,Videos,Media} /home/"$name"/Torrents/{complete,incomplete} /home/"$name"/.local/{bin,share,src,state} /media/{flash,hdd,ssd} /mnt/extra/{backup,vid,win10} && chown "$name":wheel /home/"$name"
+		usermod -a -G wheel "$name" && mkdir -p /home/"$name"/{.config.secret,Documents,Downloads,Music,Personal,Pictures,Public,Videos} /home/"$name"/Torrents/{complete,incomplete} /home/"$name"/.local/{bin,share,src,state} /media/{flash,hdd,ssd} /mnt/extra/{backup,videos,win10} && chown "$name":wheel /home/"$name"
 	export repodir="/home/$name/.local/src"
 	mkdir -p "$repodir"
 	chown -R "$name":wheel "$(dirname "$repodir")"
@@ -300,9 +300,9 @@ pamgnupg() {
 }
 
 ecryptfssetup() {
-    [ -d /home/"$name"/Media ] || mkdir -p /home/"$name"/Media && chown "$name":wheel /home/"$name"/Media
-    # Create an ecrypted folder
-    printf '\nyes\nyes\n' | mount -t ecryptfs Media Media -o passphrase_passwd="$epass1",ecryptfs_cipher=aes,ecryptfs_key_bytes=32,ecryptfs_enable_filename_crypto=y,ecryptfs_passthrough=n >/dev/null 2>&1 || exit 1
+    [ -d "/home/$name/.secret" ] && [ -d "/home/$name/Personal" ] || { mkdir -p /home/"$name"/{.secret,Personal} && chown "$name":wheel /home/"$name"/{.secret,Personal} } >/dev/null 2>&1
+    # Ecrypt the folder
+    printf '\nyes\nyes\n' | mount -t ecryptfs .secret Personal -o ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=y,passphrase_passwd="$epass1",ecryptfs_cipher=aes,ecryptfs_key_bytes=32 >/dev/null 2>&1 || exit 1
     umount /home/"$name"/Media >/dev/null 2>&1
 }
 
diff --git a/static/progs.csv b/static/progs.csv
index de53e35..c82c12b 100644
--- a/static/progs.csv
+++ b/static/progs.csv
@@ -44,6 +44,7 @@ R,cronie,is a cronjob manager to set up automatic mail syncing.
 A,gtk-theme-arc-gruvbox-git,gives the dark GTK theme used in LARBS.
 A,htop-vim,is a graphical and colorful system monitor.
 ,hugo,is a fastest framework for building websites.
+,imagemagick,is an image viewing/manipulation program.
 A,kakaotalk,is a messenger for Korean.
 ,lazygit,manages git in Neovim.
 A,lf-bin,is an extensive terminal file manager that everyone likes.
diff --git a/static/thesiah.sh b/static/thesiah.sh
index 7a49c66..48b7e2b 100755
--- a/static/thesiah.sh
+++ b/static/thesiah.sh
@@ -76,7 +76,7 @@ adduserandpass() {
 	# Adds user `$name` with password $pass1.
 	whiptail --infobox "Adding user \"$name\"..." 7 50
 	useradd -m -g wheel -s /bin/zsh "$name" >/dev/null 2>&1 ||
-		usermod -a -G wheel "$name" && mkdir -p /home/"$name"/{.config,Documents,Downloads,Music,Pictures,Videos,Media} /home/"$name"/Torrents/{complete,incomplete} /home/"$name"/.local/{bin,share,src,state} /media/{flash,hdd,ssd} /mnt/extra/{backup,vid,win10} && chown "$name":wheel /home/"$name"
+		usermod -a -G wheel "$name" && mkdir -p /home/"$name"/{.config.secret,Documents,Downloads,Music,Personal,Pictures,Public,Videos} /home/"$name"/Torrents/{complete,incomplete} /home/"$name"/.local/{bin,share,src,state} /media/{flash,hdd,ssd} /mnt/extra/{backup,videos,win10} && chown "$name":wheel /home/"$name"
 	export repodir="/home/$name/.local/src"
 	mkdir -p "$repodir"
 	chown -R "$name":wheel "$(dirname "$repodir")"
@@ -300,9 +300,9 @@ pamgnupg() {
 }
 
 ecryptfssetup() {
-    [ -d /home/"$name"/Media ] || mkdir -p /home/"$name"/Media && chown "$name":wheel /home/"$name"/Media
-    # Create an ecrypted folder
-    printf '\nyes\nyes\n' | mount -t ecryptfs Media Media -o passphrase_passwd="$epass1",ecryptfs_cipher=aes,ecryptfs_key_bytes=32,ecryptfs_enable_filename_crypto=y,ecryptfs_passthrough=n >/dev/null 2>&1 || exit 1
+    [ -d "/home/$name/.secret" ] && [ -d "/home/$name/Personal" ] || { mkdir -p /home/"$name"/{.secret,Personal} && chown "$name":wheel /home/"$name"/{.secret,Personal} } >/dev/null 2>&1
+    # Ecrypt the folder
+    printf '\nyes\nyes\n' | mount -t ecryptfs .secret Personal -o ecryptfs_passthrough=n,ecryptfs_enable_filename_crypto=y,passphrase_passwd="$epass1",ecryptfs_cipher=aes,ecryptfs_key_bytes=32 >/dev/null 2>&1 || exit 1
     umount /home/"$name"/Media >/dev/null 2>&1
 }