Last release before rewrite

1 files changed, 10 insertions, 15 deletions

diff --git a/install.sh b/install.sh
index 353e84a..dd8f5a1 100755
--- a/install.sh
+++ b/install.sh
@@ -6,28 +6,21 @@ sudo pacman -S --needed dialog
 dwm="dwm-6.2"
 dmenu="dmenu-5.0"
 st="st"
-theme="red"
+dwmblocks="dwmblocks"
 
-dialog --title "sarc" --msgbox "Welcome to the sarc installer!" 0 0
-dialog --title "sarc" --inputbox "What theme would you like? Choose from green, blue, and red" 0 0 2> /tmp/.theme_sel
+dialog --title "sarc stable" --msgbox "Welcome to the sarc installer!" 0 0
+dialog --title "sarc stable" --inputbox "What theme would you like? Choose from green, blue, and red" 0 0 2> /tmp/.theme_sel
 clear
 
 theme="$(cat /tmp/.theme_sel)"
 
 	echo "Your theme is $theme"
-	sudo pacman -Sy --needed webkit2gtk dialog bash wpa_supplicant iw dhcpcd adobe-source-code-pro-fonts falkon libnotify xorg xorg-xinit light picom feh dunst pulseaudio
+	sudo pacman -Sy --needed webkit2gtk dialog wpa_supplicant iw dhcpcd adobe-source-code-pro-fonts falkon libnotify xorg xorg-xinit light picom feh dunst pulseaudio
 	
-	echo "Copying old sarc config to ~/.config/sarc.old"
-	mv ~/.config/sarc ~/.config/sarc.old
-
-	echo "Making config folders"	
- 	mkdir -p ~/.config/sarc/
-	mkdir -p ~/.icons/default/
-	
-	etc/cursor
+	echo "Setting up config folders"
+	mkdir -p ~/.config/sarc
 	cp -r * ~/.config/sarc/
 	cd ~/.config/sarc/
-	sudo cp /etc/ns.conf /etc/
 
 	cd $dwm
 	cp ./themes/$theme ./config.h
@@ -50,7 +43,9 @@ theme="$(cat /tmp/.theme_sel)"
 	echo "Copying files"
 	
 	mkdir ~/.dwm
-	mkdir ~/.icons/
+
+	sudo cp etc/ns.conf /etc
+	etc/cursor
 	cp ./etc/.xinitrc ~
 	cp ./etc/$theme.wallpaper.jpg ~/.config/
 	mv ~/.config/$theme.wallpaper.jpg ~/.config/wallpaper.jpg
@@ -59,4 +54,4 @@ theme="$(cat /tmp/.theme_sel)"
 	sudo cp ./bin/* /usr/local/bin
 
 	dialog --title "sarc" --msgbox "The installation is complete! Type *startx* to launch dwm." 0 0
-clear
+	clear