auto


Logs | Files | README | LICENSE | GitLab


1
commit 3023b69c92da8e09d34af957795b52441d1867c3
2
Author: nvx1 <[email protected]>
3
Date:   Tue Mar 29 02:00:25 2022 +0200
4
5
    Update.
6
---
7
 AutoInstall | 34 ++++++++++++++++------------------
8
 1 file changed, 16 insertions(+), 18 deletions(-)
9
10
diff --git a/AutoInstall b/AutoInstall
11
index d1dfbd4..e7ef356 100755
12
--- a/AutoInstall
13
+++ b/AutoInstall
14
@@ -77,7 +77,7 @@ initmsg2(){
15
 	dialog --colors --title " Please Note :" --yes-label " Lets Boogie! " --no-label " Lets not boogie :| " --yesno "\\n  An Arch Linux, or Arch based system is required for the installation of AutoLinux.\\n\\n       If you are running any other distrobution the installation will fail." 9 90 ; }
16
 
17
 selKernel(){
18
-  kernel="$(dialog --stdout --colors --title "Kernel Selection" --menu "             Please choose your kernel:\\n (If unsure, just select the default linux kernel)" 14 56 6 "${KERNELS[@]}" 3>&1 1>&2 2>&3 3>&1)" ; } 
19
+  kernel="$(dialog --colors --title "Kernel Selection" --menu "             Please choose your kernel:\\n (If unsure, just select the default linux kernel)" 14 56 6 "${KERNELS[@]}" 3>&1 1>&2 2>&3 3>&1)" ; } 
20
 
21
 
22
 user_and_password() {
23
@@ -355,9 +355,9 @@ grubtheme(){ \
24
 
25
 finalize(){ \
26
 	dialog --infobox "Preparing welcome message..." 4 50
27
-    [ $edition = '1' ] && dialog --title "Time to Celebrate!" --msgbox "\\nInstallation completed successfully! Provided there were no hidden errors, all the programs and configuration files should be in place.\\n\\nTo run the new graphical environment, log out and log back in as your new user, then run the command 'startx' to start the graphical environment \\n(it will start automatically in tty1).\\n\\n Enjoy AutoLinux!   - dqYpb" 13 80 ; 
28
-    [ $edition = '2' ] && sed -i 's/Name=.*$/Name=AutoLinux (Plasma)/g' /usr/share/xsessions/plasma.desktop && cp -r /home/$name/.local/bin/* /usr/local/bin/ &&
29
-      dialog --title "Time to Celebrate" --msgbox "\\n                     The AutoLinux installation process has completed successfully\!\\n\\n\\n   Provided there were no hidden errors, all the programs and configuration files should be in place.\\n\\nautolinux-Plasma will automatically start up in the login manager the next time you reboot your computer.\\n\\n\\n\\n Enjoy AutoLinux!   - dqYpb" 17 110 ; }
30
+  case $edition in
31
+    2) sed -i 's/Name=.*$/Name=AutoLinux (Plasma)/g' /usr/share/xsessions/plasma.desktop && cp -r /home/$name/.local/bin/* /usr/local/bin/ && dialog --title "Time to Celebrate" --msgbox "\\n                     The AutoLinux installation process has completed successfully\!\\n\\n\\n   Provided there were no hidden errors, all the programs and configuration files should be in place.\\n\\nautolinux-Plasma will automatically start up in the login manager the next time you reboot your computer.\\n\\n\\n\\n Enjoy AutoLinux!   - a4to" 17 110 ;;
32
+    *) dialog --title "Time to Celebrate!" --msgbox "\\nInstallation completed successfully! Provided there were no hidden errors, all the programs and configuration files should be in place.\\n\\nTo run the new graphical environment, log out and log back in as your new user, then run the command 'startx' to start the graphical environment \\n(it will start automatically in tty1).\\n\\n Enjoy AutoLinux!   - a4to" 13 80 ;; esac ; } 
33
 
34
 
35
 rebootmsg(){ \
36
@@ -417,24 +417,22 @@ sudoers "%wheel ALL=(ALL) NOPASSWD: ALL #AutoLinux"
37
 
38
 archlinuxinstall yay-bin
39
 
40
+case $edition in
41
+  1) pkgsfile="https://gitlab.com/qYp/autolinux/-/raw/editions/dwm.csv" && gitbranch="dwm" ;;
42
+  2) pkgsfile="https://gitlab.com/qYp/autolinux/-/raw/editions/plasma.csv" && gitbranch="plasma" ;;
43
+esac
44
 
45
-[ $edition = '1' ] && pkgsfile="https://gitlab.com/qYp/autolinux/-/raw/editions/dwm.csv" && gitbranch="dwm"
46
-
47
-[ $edition = '2' ] && pkgsfile="https://gitlab.com/qYp/autolinux/-/raw/editions/plasma.csv" && gitbranch="plasma"
48
-
49
-
50
-[ $kernel = '1' ] && kernelChoice='linux'
51
-  
52
-[ $kernel = '2' ] && kernelChoice='linux-lts'
53
-
54
-[ $kernel = '3' ] && kernelChoice='linux-hardened'
55
-
56
-[ $kernel = '4' ] && kernelChoice='linux-zen'
57
+case $kernel in
58
+  1) kernelChoice='linux' ;;                            
59
+  2) kernelChoice='linux-lts' ;;
60
+  3) kernelChoice='linux-hardened' ;;
61
+  4) kernelChoice='linux-zen' ;;
62
+esac
63
 
64
 
65
 for x in $kernelChoice ; do
66
-	dialog --title "$TITLE" --infobox "Installing the "$x" kernel..." 5 70 && installpkg "$x"
67
-  dialog --title "$TITLE" --infobox "Installing the "$x"-headers package..." 5 70 && installpkg "$x"-headers
68
+	dialog --title "$TITLE" --infobox "\\nInstalling the "$x" kernel..." 5 70 && installpkg "$x"
69
+  dialog --title "$TITLE" --infobox "\\nInstalling the "$x" headers..." 5 70 && installpkg "$x"-headers
70
 done
71
 
72