Skip to content

Commit 691139f

Browse files
author
nnyyxxxx
committed
Replace echos with printf (utils)
1 parent 719548f commit 691139f

File tree

8 files changed

+228
-236
lines changed

8 files changed

+228
-236
lines changed

tabs/utils/auto-login.sh

Lines changed: 63 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
# Function to list common session options
66
list_sessions() {
7-
echo "Select the session:"
8-
echo "1) GNOME (gnome.desktop)"
9-
echo "2) KDE Plasma (plasma.desktop)"
10-
echo "3) XFCE (xfce.desktop)"
11-
echo "4) LXDE (LXDE.desktop)"
12-
echo "5) LXQt (lxqt.desktop)"
13-
echo "6) Cinnamon (cinnamon.desktop)"
14-
echo "7) MATE (mate.desktop)"
15-
echo "8) Openbox (openbox.desktop)"
16-
echo "9) i3 (i3.desktop)"
17-
echo "10) Custom session"
18-
echo "Enter your choice [1-10]: "
7+
printf "Select the session:\n"
8+
printf "1) GNOME (gnome.desktop)\n"
9+
printf "2) KDE Plasma (plasma.desktop)\n"
10+
printf "3) XFCE (xfce.desktop)\n"
11+
printf "4) LXDE (LXDE.desktop)\n"
12+
printf "5) LXQt (lxqt.desktop)\n"
13+
printf "6) Cinnamon (cinnamon.desktop)\n"
14+
printf "7) MATE (mate.desktop)\n"
15+
printf "8) Openbox (openbox.desktop)\n"
16+
printf "9) i3 (i3.desktop)\n"
17+
printf "10) Custom session\n"
18+
printf "Enter your choice [1-10]: "
1919
read session_choice
2020

2121
case "$session_choice" in
@@ -29,151 +29,150 @@ list_sessions() {
2929
8) session="openbox.desktop" ;;
3030
9) session="i3.desktop" ;;
3131
10)
32-
echo "Enter custom session name (e.g., mysession.desktop): "
32+
printf "Enter custom session name (e.g., mysession.desktop): "
3333
read -r session ;;
3434
*)
35-
echo "Invalid option selected."
35+
printf "Invalid option selected.\n"
3636
exit 1 ;;
3737
esac
3838
}
3939

4040
# Function to configure LightDM
4141
configure_lightdm() {
42-
echo "Configuring LightDM for autologin..."
42+
printf "Configuring LightDM for autologin...\n"
4343

44-
echo "Enter username for LightDM autologin: "
44+
printf "Enter username for LightDM autologin: "
4545
read -r user
4646

47-
$ESCALATION_TOOL "echo '[Seat:*]' > /etc/lightdm/lightdm.conf.d/50-autologin.conf"
48-
$ESCALATION_TOOL "echo 'autologin-user=$user' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf"
49-
$ESCALATION_TOOL "echo 'autologin-user-timeout=0' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf"
47+
$ESCALATION_TOOL "printf '[Seat:*]' > /etc/lightdm/lightdm.conf.d/50-autologin.conf"
48+
$ESCALATION_TOOL "printf 'autologin-user=$user' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf"
49+
$ESCALATION_TOOL "printf 'autologin-user-timeout=0' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf"
5050

51-
echo "LightDM has been configured for autologin."
51+
printf "LightDM has been configured for autologin.\n"
5252
}
5353

5454
# Function to remove LightDM autologin
5555
remove_lightdm_autologin() {
56-
echo "Removing LightDM autologin configuration..."
56+
printf "Removing LightDM autologin configuration...\n"
5757
$ESCALATION_TOOL rm -f /etc/lightdm/lightdm.conf.d/50-autologin.conf
58-
echo "LightDM autologin configuration has been removed."
58+
printf "LightDM autologin configuration has been removed.\n"
5959
}
6060

6161
# Function to configure GDM
6262
configure_gdm() {
63-
echo "Configuring GDM for autologin..."
63+
printf "Configuring GDM for autologin...\n"
6464

65-
echo "Enter username for GDM autologin: "
65+
printf "Enter username for GDM autologin: "
6666
read -r user
6767

68-
$ESCALATION_TOOL "echo '[daemon]' > /etc/gdm/custom.conf"
69-
$ESCALATION_TOOL "echo 'AutomaticLoginEnable = true' >> /etc/gdm/custom.conf"
70-
$ESCALATION_TOOL "echo 'AutomaticLogin = $user' >> /etc/gdm/custom.conf"
68+
$ESCALATION_TOOL "printf '[daemon]' > /etc/gdm/custom.conf"
69+
$ESCALATION_TOOL "printf 'AutomaticLoginEnable = true' >> /etc/gdm/custom.conf"
70+
$ESCALATION_TOOL "printf 'AutomaticLogin = $user' >> /etc/gdm/custom.conf"
7171

72-
echo "GDM has been configured for autologin."
72+
printf "GDM has been configured for autologin.\n"
7373
}
7474

7575
# Function to remove GDM autologin
7676
remove_gdm_autologin() {
77-
echo "Removing GDM autologin configuration..."
77+
printf "Removing GDM autologin configuration...\n"
7878
$ESCALATION_TOOL sed -i '/AutomaticLoginEnable/d' /etc/gdm/custom.conf
7979
$ESCALATION_TOOL sed -i '/AutomaticLogin/d' /etc/gdm/custom.conf
80-
echo "GDM autologin configuration has been removed."
80+
printf "GDM autologin configuration has been removed.\n"
8181
}
8282

8383
# Function to configure SDDM
8484
configure_sddm() {
85-
echo "Configuring SDDM for autologin..."
85+
printf "Configuring SDDM for autologin...\n"
8686

87-
echo "Enter username for SDDM autologin: "
87+
printf "Enter username for SDDM autologin: "
8888
read -r user
8989
list_sessions # Show session options
9090

91-
$ESCALATION_TOOL "echo '[Autologin]' > /etc/sddm.conf"
92-
$ESCALATION_TOOL "echo 'User=$user' >> /etc/sddm.conf"
93-
$ESCALATION_TOOL "echo 'Session=$session' >> /etc/sddm.conf"
91+
$ESCALATION_TOOL "printf '[Autologin]' > /etc/sddm.conf"
92+
$ESCALATION_TOOL "printf 'User=$user' >> /etc/sddm.conf"
93+
$ESCALATION_TOOL "printf 'Session=$session' >> /etc/sddm.conf"
9494

95-
echo "SDDM has been configured for autologin."
95+
printf "SDDM has been configured for autologin.\n"
9696
}
9797

9898
# Function to remove SDDM autologin
9999
remove_sddm_autologin() {
100-
echo "Removing SDDM autologin configuration..."
100+
printf "Removing SDDM autologin configuration...\n"
101101
$ESCALATION_TOOL sed -i '/\[Autologin\]/,+2d' /etc/sddm.conf
102-
echo "SDDM autologin configuration has been removed."
102+
printf "SDDM autologin configuration has been removed.\n"
103103
}
104104

105105
# Function to configure LXDM
106106
configure_lxdm() {
107-
echo "Configuring LXDM for autologin..."
107+
printf "Configuring LXDM for autologin...\n"
108108

109-
echo "Enter username for LXDM autologin: "
109+
printf "Enter username for LXDM autologin: "
110110
read -r user
111111
list_sessions # Show session options
112112

113113
$ESCALATION_TOOL sed -i "s/^#.*autologin=.*$/autologin=${user}/" /etc/lxdm/lxdm.conf
114114
$ESCALATION_TOOL sed -i "s|^#.*session=.*$|session=/usr/bin/${session}|; s|^session=.*$|session=/usr/bin/${session}|" /etc/lxdm/lxdm.conf
115115

116-
echo "LXDM has been configured for autologin."
116+
printf "LXDM has been configured for autologin.\n"
117117
}
118118

119119
# Function to remove LXDM autologin
120120
remove_lxdm_autologin() {
121-
echo "Removing LXDM autologin configuration..."
121+
printf "Removing LXDM autologin configuration...\n"
122122
$ESCALATION_TOOL sed -i "s/^autologin=.*$/#autologin=/" /etc/lxdm/lxdm.conf
123123
$ESCALATION_TOOL sed -i "s/^session=.*$/#session=/" /etc/lxdm/lxdm.conf
124-
echo "LXDM autologin configuration has been removed."
124+
printf "LXDM autologin configuration has been removed.\n"
125125
}
126126

127127
# Function to configure or remove autologin based on user choice
128128
configure_or_remove_autologin() {
129-
echo "Do you want to add or remove autologin?"
130-
echo "1) Add autologin"
131-
echo "2) Remove autologin"
132-
echo "Enter your choice [1-2]: "
129+
printf "Do you want to add or remove autologin?\n"
130+
printf "1) Add autologin\n"
131+
printf "2) Remove autologin\n"
132+
printf "Enter your choice [1-2]: "
133133
read action_choice
134134

135135
if [ "$action_choice" = "1" ]; then
136-
echo "Choose the display manager to configure:"
137-
echo "1) LightDM"
138-
echo "2) GDM"
139-
echo "3) SDDM"
140-
echo "4) LXDM"
141-
echo "Enter your choice [1-4]: "
136+
printf "Choose the display manager to configure:\n"
137+
printf "1) LightDM\n"
138+
printf "2) GDM\n"
139+
printf "3) SDDM\n"
140+
printf "4) LXDM\n"
141+
printf "Enter your choice [1-4]: "
142142
read choice
143143

144144
case "$choice" in
145145
1) configure_lightdm ;;
146146
2) configure_gdm ;;
147147
3) configure_sddm ;;
148148
4) configure_lxdm ;;
149-
*) echo "Invalid option selected." ;;
149+
*) printf "Invalid option selected.\n" ;;
150150
esac
151151
elif [ "$action_choice" = "2" ]; then
152-
echo "Choose the display manager to remove autologin:"
153-
echo "1) LightDM"
154-
echo "2) GDM"
155-
echo "3) SDDM"
156-
echo "4) LXDM"
157-
echo "Enter your choice [1-4]: "
152+
printf "Choose the display manager to remove autologin:\n"
153+
printf "1) LightDM\n"
154+
printf "2) GDM\n"
155+
printf "3) SDDM\n"
156+
printf "4) LXDM\n"
157+
printf "Enter your choice [1-4]: "
158158
read choice
159159

160160
case "$choice" in
161161
1) remove_lightdm_autologin ;;
162162
2) remove_gdm_autologin ;;
163163
3) remove_sddm_autologin ;;
164164
4) remove_lxdm_autologin ;;
165-
*) echo "Invalid option selected." ;;
165+
*) printf "Invalid option selected.\n" ;;
166166
esac
167167
else
168-
echo "Invalid choice. Exiting..."
168+
printf "Invalid choice. Exiting...\n"
169169
exit 1
170170
fi
171171

172-
echo "Action completed. Exiting..."
172+
printf "Action completed. Exiting...\n"
173173
exit 0
174174
}
175175

176-
177176
checkEnv
178177
checkEscalationTool
179178
configure_or_remove_autologin

tabs/utils/bluetooth-control.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ main_menu() {
3535
clear
3636
printf "%b\n" "${YELLOW}Bluetooth Manager${RC}"
3737
printf "%b\n" "${YELLOW}=================${RC}"
38-
echo "1. Scan for devices"
39-
echo "2. Pair with a device"
40-
echo "3. Connect to a device"
41-
echo "4. Disconnect from a device"
42-
echo "5. Remove a device"
43-
echo "0. Exit"
44-
echo -n "Choose an option: "
38+
printf "1. Scan for devices\n"
39+
printf "2. Pair with a device\n"
40+
printf "3. Connect to a device\n"
41+
printf "4. Disconnect from a device\n"
42+
printf "5. Remove a device\n"
43+
printf "0. Exit\n"
44+
printf -n "Choose an option: "
4545
read choice
4646

4747
case $choice in
@@ -66,7 +66,7 @@ scan_devices() {
6666
printf "%b\n" "${RED}No devices found.${RC}"
6767
else
6868
printf "%b\n" "${GREEN}Devices found:${RC}"
69-
echo "$devices"
69+
printf "%s\n" "$devices"
7070
fi
7171
printf "Press any key to return to the main menu..."
7272
read -r dummy
@@ -94,11 +94,11 @@ prompt_for_mac() {
9494
device_list=$(echo "$devices" | tr '\n' '\n')
9595
i=1
9696
echo "$device_list" | while IFS= read -r device; do
97-
echo "$i. $device"
97+
printf "%d. %s\n" "$i" "$device"
9898
i=$((i + 1))
9999
done
100-
echo "0. Exit to main menu"
101-
echo -n "$prompt_msg"
100+
printf "0. Exit to main menu\n"
101+
printf "%s\n" "$prompt_msg"
102102
read choice
103103

104104
# Validate the choice

tabs/utils/create-bootable-usb.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
# Function to display usage instructions
66
usage() {
77
printf "%b\n" "${RED} Usage: $0 ${RC}"
8-
echo "No arguments needed. The script will prompt for ISO path and USB device."
8+
printf "No arguments needed. The script will prompt for ISO path and USB device.\n"
99
exit 1
1010
}
1111

1212
# Function to display all available block devices
1313
list_devices() {
1414
printf "%b\n" "${YELLOW} Available devices and partitions: ${RC}"
15-
echo ""
15+
printf "\n"
1616
$ESCALATION_TOOL lsblk -o NAME,FSTYPE,SIZE,MOUNTPOINT,LABEL
17-
echo ""
17+
printf "\n"
1818
}
1919

2020
# Function to fetch the latest Arch Linux ISO
@@ -47,7 +47,7 @@ fetch_arch_older_isos() {
4747
printf "%-5s${YELLOW}%-15s ${RC}" "$COUNTER)" "$VERSION"
4848

4949
if [ $(( COUNTER % ROW_ITEMS )) -eq 0 ]; then
50-
echo "" # New line after every 6 versions
50+
printf "\n" # New line after every 6 versions
5151
fi
5252

5353
COUNTER=$((COUNTER + 1))
@@ -60,7 +60,6 @@ fetch_arch_older_isos() {
6060
printf "%b\n" "${GREEN}Selected Arch Linux (older) ISO URL: $ARCH_URL${RC}"
6161
}
6262

63-
6463
# Function to fetch the latest Debian Linux ISO
6564
fetch_debian_latest_iso() {
6665
DEBIAN_URL=$(curl -s https://www.debian.org/distrib/netinst | grep -oP '(?<=href=")[^"]+debian-[0-9.]+-amd64-netinst.iso(?=")' | head -1)
@@ -99,10 +98,10 @@ choose_iso_source() {
9998
fetch_iso_urls() {
10099
clear
101100
printf "%b\n" "${YELLOW}Available ISOs for download:${RC}"
102-
echo "1) Arch Linux (latest)"
103-
echo "2) Arch Linux (older versions)"
104-
echo "3) Debian Linux (latest)"
105-
echo ""
101+
printf "1) Arch Linux (latest)\n"
102+
printf "2) Arch Linux (older versions)\n"
103+
printf "3) Debian Linux (latest)\n"
104+
printf "\n"
106105
read -p "Select the ISO you want to download (1-3): " ISO_OPTION
107106

108107
case $ISO_OPTION in

tabs/utils/numlock.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Create a script to toggle numlock
99

1010
create_file() {
11-
echo "Creating script..."
11+
printf "Creating script...\n"
1212
$ESCALATION_TOOL tee "/usr/local/bin/numlock" >/dev/null <<'EOF'
1313
#!/bin/bash
1414
@@ -23,7 +23,7 @@ EOF
2323

2424
# Create a systemd service to run the script on boot
2525
create_service() {
26-
echo "Creating service..."
26+
printf "Creating service...\n"
2727
$ESCALATION_TOOL tee "/etc/systemd/system/numlock.service" >/dev/null <<'EOF'
2828
[Unit]
2929
Description=numlock
@@ -52,11 +52,10 @@ numlockSetup() {
5252
read -r confirm
5353
if [ "$confirm" = "y" ] || [ "$confirm" = "Y" ]; then
5454
$ESCALATION_TOOL systemctl enable numlock.service --quiet
55-
echo "Numlock will be enabled on boot"
55+
printf "Numlock will be enabled on boot\n"
5656
else
5757
$ESCALATION_TOOL systemctl disable numlock.service --quiet
58-
echo "Numlock will not be enabled on boot"
59-
58+
printf "Numlock will not be enabled on boot\n"
6059
fi
6160
}
6261

0 commit comments

Comments
 (0)