Modulizing the install script

2 files changed, 35 insertions, 26 deletions

diff --git a/install.sh b/install.sh
index a3a9d9c..d5d93bd 100755
--- a/install.sh
+++ b/install.sh
@@ -1,43 +1,52 @@
 #!/bin/sh
 
+# Sets the folder names
 dwm="dwm-6.2"
 dmenu="./dmenu-5.0"
 st="./st"
 dwmblocks="./dwmblocks"
 theme='blue'
 
-echo "Welcome to the archrice installer script"
-echo
-echo "Installing requirements"
-sudo pacman -Sy --needed pulseaudio feh picom dunst xorg xorg-xinit adobe-source-code-pro-fonts
-echo "Starting dwm install"
-echo "The dwm theme is $theme"
+deps() {
 
-cd dwm-6.2
-rm config.h
-cp ./themes/$theme ./config.h
-sudo make -s install > ./log.txt
+	echo "Installing requirements"
+	sudo pacman -Sy --needed pulseaudio feh picom dunst xorg xorg-xinit adobe-source-code-pro-fonts
 
-cd ../$st
-sudo make -s install > ./log.txt
+}
 
-cd ../$dmenu
-sudo make -s install > ./log.txt
 
-cd ../$dwmblocks
-sudo make -s install > ./log.txt
-cd ..
 
-echo "Copying files"
-cp ./etc/.xinitrc ~
-cp ./etc/$theme.wallpaper.jpg ~/.config/
-mv ~/.config/$theme.wallpaper.jpg ~/.config/wallpaper.jpg
+compile() {
 
-mkdir -p ~/.local/bin
-mkdir ~/.dwm/
+	cd dwm-6.2
+	rm config.h
+	cp ./themes/$theme ./config.h
+	sudo make -s install > ../log.txt
 
-cp ./etc/autostart.sh ~/.dwm/
-cp ./bin/* ~/.local/bin
+	cd ../$st
+	sudo make -s install > ../log.txt
 
-echo "Finished"
+	cd ../$dmenu
+	sudo make -s install > ../log.txt
 
+	cd ../$dwmblocks
+	sudo make -s install > ../log.txt
+	cd ..
+
+}
+
+
+cp() {
+
+	echo "Copying files"
+	cp ./etc/.xinitrc ~
+	cp ./etc/$theme.wallpaper.jpg ~/.config/
+	mv ~/.config/$theme.wallpaper.jpg ~/.config/wallpaper.jpg
+
+	mkdir -p ~/.local/bin
+	mkdir ~/.dwm/ > /dev/null
+	
+	cp ./etc/autostart.sh ~/.dwm/
+	cp ./bin/* ~/.local/bin
+
+}
diff --git a/log.txt b/log.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/log.txt