@@ -6,14 +6,14 @@ setupDWM() {
66 printf " %b\n" " ${YELLOW} Installing DWM-Titus if not already installed${RC} "
77 case " $PACKAGER " in # Install pre-Requisites
88 pacman)
9- $ESCALATION_TOOL " $PACKAGER "
9+ " $ESCALATION_TOOL " " $PACKAGER "
1010 ;;
1111 apt-get|nala)
12- $ESCALATION_TOOL " $PACKAGER "
12+ " $ESCALATION_TOOL " " $PACKAGER "
1313 ;;
1414 dnf)
15- $ESCALATION_TOOL " $PACKAGER " " Development Tools"
16- $ESCALATION_TOOL " $PACKAGER "
15+ " $ESCALATION_TOOL " " $PACKAGER " " Development Tools"
16+ " $ESCALATION_TOOL " " $PACKAGER "
1717 ;;
1818 * )
1919 printf " %b\n" " ${RED} Unsupported package manager: $PACKAGER ${RC} "
@@ -26,7 +26,7 @@ makeDWM() {
2626 cd " $HOME " && git clone https://github.com/ChrisTitusTech/dwm-titus.git # CD to Home directory to install dwm-titus
2727 # This path can be changed (e.g. to linux-toolbox directory)
2828 cd dwm-titus/ # Hardcoded path, maybe not the best.
29- $ESCALATION_TOOL make clean install # Run make clean install
29+ " $ESCALATION_TOOL " # Run make clean install
3030}
3131
3232install_nerd_font () {
@@ -115,7 +115,7 @@ picom_animations() {
115115 fi
116116
117117 # Install the built binary
118- if ! $ESCALATION_TOOL ninja -C build install; then
118+ if ! " $ESCALATION_TOOL " ; then
119119 printf " %b\n" " ${RED} Failed to install the built binary${RC} "
120120 return 1
121121 fi
@@ -179,13 +179,13 @@ setupDisplayManager() {
179179 printf " %b\n" " ${YELLOW} Setting up Xorg${RC} "
180180 case " $PACKAGER " in
181181 pacman)
182- $ESCALATION_TOOL " $PACKAGER "
182+ " $ESCALATION_TOOL " " $PACKAGER "
183183 ;;
184184 apt-get|nala)
185- $ESCALATION_TOOL " $PACKAGER "
185+ " $ESCALATION_TOOL " " $PACKAGER "
186186 ;;
187187 dnf)
188- $ESCALATION_TOOL " $PACKAGER "
188+ " $ESCALATION_TOOL " " $PACKAGER "
189189 ;;
190190 * )
191191 printf " %b\n" " ${RED} Unsupported package manager: $PACKAGER ${RC} "
@@ -207,13 +207,13 @@ setupDisplayManager() {
207207 printf " %b\n" " ${YELLOW} No display manager found, installing $DM ${RC} "
208208 case " $PACKAGER " in
209209 pacman)
210- $ESCALATION_TOOL " $PACKAGER " " $DM "
210+ " $ESCALATION_TOOL " " $PACKAGER " " $DM "
211211 ;;
212212 apt-get|nala)
213- $ESCALATION_TOOL " $PACKAGER " " $DM "
213+ " $ESCALATION_TOOL " " $PACKAGER " " $DM "
214214 ;;
215215 dnf)
216- $ESCALATION_TOOL " $PACKAGER " " $DM "
216+ " $ESCALATION_TOOL " " $PACKAGER " " $DM "
217217 ;;
218218 * )
219219 printf " %b\n" " ${RED} Unsupported package manager: $PACKAGER ${RC} "
@@ -232,28 +232,28 @@ setupDisplayManager() {
232232 printf " %b\n" " ${YELLOW} Configuring SDDM for autologin${RC} "
233233 SDDM_CONF=" /etc/sddm.conf"
234234 if [ ! -f " $SDDM_CONF " ; then
235- echo " [Autologin]" | $ESCALATION_TOOL tee -a " $SDDM_CONF "
236- echo " User=$USER " | $ESCALATION_TOOL tee -a " $SDDM_CONF "
237- echo " Session=dwm" | $ESCALATION_TOOL tee -a " $SDDM_CONF "
235+ echo " [Autologin]" | " $ESCALATION_TOOL " " $SDDM_CONF "
236+ echo " User=$USER " | " $ESCALATION_TOOL " " $SDDM_CONF "
237+ echo " Session=dwm" | " $ESCALATION_TOOL " " $SDDM_CONF "
238238 else
239- $ESCALATION_TOOL sed -i ' /^\[Autologin\]/d' " $SDDM_CONF "
240- $ESCALATION_TOOL sed -i ' /^User=/d' " $SDDM_CONF "
241- $ESCALATION_TOOL sed -i ' /^Session=/d' " $SDDM_CONF "
242- echo " [Autologin]" | $ESCALATION_TOOL tee -a " $SDDM_CONF "
243- echo " User=$USER " | $ESCALATION_TOOL tee -a " $SDDM_CONF "
244- echo " Session=dwm" | $ESCALATION_TOOL tee -a " $SDDM_CONF "
239+ " $ESCALATION_TOOL " ' /^\[Autologin\]/d' " $SDDM_CONF "
240+ " $ESCALATION_TOOL " ' /^User=/d' " $SDDM_CONF "
241+ " $ESCALATION_TOOL " ' /^Session=/d' " $SDDM_CONF "
242+ echo " [Autologin]" | " $ESCALATION_TOOL " " $SDDM_CONF "
243+ echo " User=$USER " | " $ESCALATION_TOOL " " $SDDM_CONF "
244+ echo " Session=dwm" | " $ESCALATION_TOOL " " $SDDM_CONF "
245245 fi
246246 printf " %b\n" " {YELLOW}Checking if autologin group exists${RC} "
247247 if ! getent group autologin > /dev/null; then
248248 printf " %b\n" " ${YELLOW} Creating autologin group${RC} "
249- $ESCALATION_TOOL groupadd autologin
249+ " $ESCALATION_TOOL "
250250 else
251251 printf " %b\n" " ${GREEN} Autologin group already exists${RC} "
252252 fi
253253 printf " %b\n" " ${YELLOW} Adding user with UID 1000 to autologin group${RC} "
254254 USER_UID_1000=$( getent passwd 1000 | cut -d: -f1)
255255 if [ -n " $USER_UID_1000 " ; then
256- $ESCALATION_TOOL usermod -aG autologin " $USER_UID_1000 "
256+ " $ESCALATION_TOOL " " $USER_UID_1000 "
257257 printf " %b\n" " ${GREEN} User $USER_UID_1000 added to autologin group${RC} "
258258 else
259259 printf " %b\n" " ${RED} No user with UID 1000 found - Auto login not possible${RC} "
@@ -271,8 +271,8 @@ install_slstatus() {
271271 read -r response # -r flag to prevent backslashes from being interpreted
272272 if [ " $response " = " y" || [ " $response " = " Y" ; then
273273 printf " %b\n" " ${YELLOW} Installing slstatus${RC} "
274- cd " $HOME /dwm-titus/slstatus" || { echo " Failed to change directory to slstatus" ; return 1; }
275- if $ESCALATION_TOOL make clean install; then
274+ cd " $HOME /dwm-titus/slstatus" || { printf " %b\n " " ${RED} Failed to change directory to slstatus${RC} " ; return 1; }
275+ if " $ESCALATION_TOOL " ; then
276276 printf " %b\n" " ${GREEN} slstatus installed successfully${RC} "
277277 else
278278 printf " %b\n" " ${RED} Failed to install slstatus${RC} "
0 commit comments