cleanup paths for aur installation

add screenshot directory creation

arch.sh

@@ -129,7 +129,7 @@ pacman -Syu --noconfirm $PACKAGES
 # install base configuration files from repository
 [ -d /srv/arch-desktop/install ] || git clone https://git.caseydelorme.com/cdelorme/arch-desktop /srv/arch-desktop
 rsync -Pav /srv/arch-desktop/install/ /
-mkdir -p /etc/skel/{desktop,downloads,public,public/templates,documents,music,pictures,videos,code}
+mkdir -p /etc/skel/{desktop,downloads,public,public/templates,documents,music,pictures/{wallpaper,screenshots},videos,code/aur.archlinux.org}
 rsync -Pav /etc/skel/ "$(getent passwd root | cut -d: -f6)/"
 sed -i "/ssh-add/d" "$(getent passwd root | cut -d: -f6)/.bashrc"
 
@@ -210,29 +210,30 @@ if [ ! -f "/etc/systemd/system/transmission.service.d/local.conf" ]; then
 	su $username -c 'cd && tmp=$(mktemp) && jq ".[\"download-dir\"] = \"${HOME}/transmission/done\"" $HOME/.config/transmission-daemon/settings.json | jq ".[\"incomplete-dir\"] = \"${HOME}/transmission/incomplete\"" | jq ".[\"watch-dir\"] = \"$(xdg-user-dir DOWNLOAD)\"" > $tmp && mv $tmp $HOME/.config/transmission-daemon/settings.json'
 fi
 
-su $username -c "mkdir -p ~/code/aur.archlinux.org"
+# consolidate paths for aur
 export user_home="$(getent passwd $username | cut -d: -f6)/"
+export aur_home="${user_home}aur.archlinux.org/"
 
 # install qview
-sudo -u $username git clone https://aur.archlinux.org/qview.git ${user_home}/aur.archlinux.org/qview
-(cd ${user_home}/aur.archlinux.org/qview && sudo -u ${username} makepkg -rcsi --noconfirm)
+sudo -u $username git clone https://aur.archlinux.org/qview.git ${aur_home}qview
+(cd ${aur_home}qview && sudo -u ${username} makepkg -rcsi --noconfirm)
 
 # cmst (for connman UI)
-sudo -u $username git clone https://aur.archlinux.org/cmst.git ${user_home}/aur.archlinux.org/cmst
-(cd ${user_home}/aur.archlinux.org/cmst && sudo -u ${username} makepkg -rcsi --noconfirm)
+sudo -u $username git clone https://aur.archlinux.org/cmst.git ${aur_home}cmst
+(cd ${aur_home}cmst && sudo -u ${username} makepkg -rcsi --noconfirm)
 
 # brave browser (plus override to bypass keyring)
-sudo -u $username git clone https://aur.archlinux.org/brave-bin.git ${user_home}/aur.archlinux.org/brave-bin
-(cd ${user_home}/aur.archlinux.org/brave-bin && sudo -u ${username} makepkg -rcsi --noconfirm)
+sudo -u $username git clone https://aur.archlinux.org/brave-bin.git ${aur_home}brave-bin
+(cd ${aur_home}brave-bin && sudo -u ${username} makepkg -rcsi --noconfirm)
 [ -f /usr/share/applications/brave-browser.desktop ] && sed -i 's|Exec=brave|Exec=brave --password-store=basic|g' /usr/share/applications/brave-browser.desktop
 
 # install vimix-cursors
-sudo -u $username git clone https://aur.archlinux.org/vimix-cursors.git ${user_home}/aur.archlinux.org/vimix-cursors
-(cd ${user_home}/aur.archlinux.org/vimix-cursors && sudo -u ${username} makepkg -rcsi --noconfirm)
+sudo -u $username git clone https://aur.archlinux.org/vimix-cursors.git ${aur_home}vimix-cursors
+(cd ${aur_home}vimix-cursors && sudo -u ${username} makepkg -rcsi --noconfirm)
 
 # install numix-icon-theme
-sudo -u $username git clone https://aur.archlinux.org/numix-icon-theme-git.git ${user_home}/aur.archlinux.org/numix-icon-theme-git
-(cd ${user_home}/aur.archlinux.org/numix-icon-theme-git && sudo -u ${username} makepkg -rcsi --noconfirm)
+sudo -u $username git clone https://aur.archlinux.org/numix-icon-theme-git.git ${aur_home}numix-icon-theme-git
+(cd ${aur_home}numix-icon-theme-git && sudo -u ${username} makepkg -rcsi --noconfirm)
 
 # restore password requirement to sudo group
 echo '%sudo ALL=(ALL) ALL' > /etc/sudoers.d/sudo

install/usr/local/bin/screenshot

@@ -1,2 +1,3 @@
 #!/bin/bash
+[ -d $(xdg-user-dir PICTURES)/screenshots ] || mkdir -p $(xdg-user-dir PICTURES)/screenshots
 grim -o $(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name') "$(xdg-user-dir PICTURES)/screenshots/$(date +'%Y%m%d_%H%M%S%N.png')"

install/usr/local/bin/screenshot-selection

@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -d $(xdg-user-dir PICTURES)/screenshots ] || mkdir -p $(xdg-user-dir PICTURES)/screenshots
 dimensions=$(slurp 2>/dev/null)
 if [ $? -eq 0 ]; then
 	grim -g "$dimensions" "$(xdg-user-dir PICTURES)/screenshots/$(date +'%Y%m%d_%H%M%S%N.png')"