auto :: fec7495

	Hash	Commit message	Author	Date	Files	+	-
1	commit fec7495a834bb970129bf9fbd137f065f1b126b8
2	Author: Connor Etherington <[email protected]>
3	Date: Fri Jun 3 21:30:30 2022 +0200
4
5	Auto-Commit Update - 20220603
6	---
7	PKGBUILD \| 2 +-
8	usr/bin/autoInstall \| 71 ++++++++++++++++++++++++++++++++++-------------------
9	2 files changed, 47 insertions(+), 26 deletions(-)
10
11	diff --git a/PKGBUILD b/PKGBUILD
12	index b70b7ab..ac51f00 100644
13	--- a/PKGBUILD
14	+++ b/PKGBUILD
15	@@ -1,7 +1,7 @@
16	# Maintainer: Connor Etherington <[email protected]>
17	# ---
18	pkgname=auto
19	-pkgver=4.3
20	+pkgver=4.4
21	pkgrel=1
22	pkgdesc='ArchLinux bootstrap and partitioning scripts, with a selection of WM and DEs'
23	arch=(x86_64)
24	diff --git a/usr/bin/autoInstall b/usr/bin/autoInstall
25	index 7428285..d8e4a1a 100755
26	--- a/usr/bin/autoInstall
27	+++ b/usr/bin/autoInstall
28	@@ -57,10 +57,11 @@ KERNELS=(
29	EDITIONS=(
30	'1' 'AutoLinux - DWM Edition '
31	'2' 'AutoLinux - Plasma Edition '
32	- '3' 'KDE Plasma (Plasma Desktop and Apps) '
33	- '4' 'Gnome (Gnome Desktop and Apps) '
34	- '5' 'Xfce (Xfce4 Desktop and Apps) '
35	- '6' 'Bare Arch Linux (No Additional Packages) ')
36	+ '3' 'AutoLinux - Server Suite Edition '
37	+ '4' 'KDE Plasma (Plasma Desktop and Apps) '
38	+ '5' 'Gnome (Gnome Desktop and Apps) '
39	+ '6' 'Xfce (Xfce4 Desktop and Apps) '
40	+ '7' 'Bare Arch Linux (No Additional Packages) ')
41
42
43	installpkg(){ pacman --noconfirm --needed -S "$*" >/dev/null 2>&1 ; }
44	@@ -173,7 +174,15 @@ addConcise(){
45
46	[concise]
47	SigLevel = Required DatabaseOptional
48	-Server = https://gitlab.com/a4to/\$repo/-/raw/master/\$arch
49	+Include = /etc/pacman.d/concise-mirrorlist
50	+
51	+EOF
52	+
53	+cat <<-EOF > /etc/pacman.d/concise-mirrorlist
54	+
55	+Server = https://gitlab.com/a4to/concise/-/raw/master/x86_64/
56	+Server = https://concise.cc/concise/
57	+
58	EOF
59
60	pacman-key --init >/dev/null 2>&1
61	@@ -340,17 +349,17 @@ dialog --infobox "Setting System Information..." 4 40 ; sleep 2
62	case $edition in
63	1) systemctl enable mpd.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
64	2) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
65	- 3) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
66	- 4) systemctl enable gdm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
67	- 5) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
68	+ 4) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
69	+ 5) systemctl enable gdm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
70	+ 6) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;
71	esac
72
73	case $edition in
74	- 1\|2) hostname="AutoLinux" ; grep -q "ILoveCandy" /etc/pacman.conf \|\|
75	+ 1\|2\|3) hostname="AutoLinux" ; grep -q "ILoveCandy" /etc/pacman.conf \|\|[41m
76	sed -i "/^\[options\]/aILoveCandy" /etc/pacman.conf ;
77	- sed -i "/^#ParallelDownloads = .*/ParallelDownloads = 10/;s/^#Color$/Color/" /etc/pacman.conf
78	+ sed -i "s/^#ParallelDownloads = .*/ParallelDownloads = 10/;s/#Color/Color/" /etc/pacman.conf
79	systemctl enable bluetooth-autoconnect.service >/dev/null 2>&1 ;;
80	- 3\|4\|5\|6) hostname="ArchLinux" ;;
81	+ 4\|5\|6\|7) hostname="ArchLinux" ;;
82	esac
83
84	! [ -f /etc/hostname ] && echo "$hostname" > /etc/hostname
85	@@ -378,6 +387,15 @@ yesGrub(){ \
86	grub-install --target=x86_64-efi --bootloader-id=AutoLinux --recheck >/dev/null 2>&1 ;
87	grub-mkconfig -o /boot/grub/grub.cfg >/dev/null 2>&1 ; grubtheme ; }
88
89	+yesGrub2(){ \
90	+ dialog --infobox "Configuring Grub to Use Theming..." 4 40
91	+ pacman -S --noconfirm --needed grub >/dev/null 2>&1[41m
92	+ ! [ -d /sys/firmware/efi/efivars ] &&[41m
93	+ grub-install --target=i386-pc --bootloader-id=AutoLinux --force >/dev/null 2>&1 ;
94	+ [ -d /sys/firmware/efi/efivars ] && pacman -S --noconfirm --needed grub efibootmgr >/dev/null 2>&1 &&
95	+ grub-install --target=x86_64-efi --bootloader-id=AutoLinux --recheck >/dev/null 2>&1 ;
96	+ grub-mkconfig -o /boot/grub/grub.cfg >/dev/null 2>&1 ; grubtheme ; }
97	+
98	grubTheme(){ \
99	dialog --infobox "Setting Grub theme..." 4 30
100	sleep 1 && mkdir -p /boot/grub/themes/AutoLinux &&
101	@@ -425,7 +443,7 @@ root_user_password \|\| err "User exited."
102	selKernel \|\| err "User exited."
103
104	case ${edition} in
105	- 3\|4\|5\|6) conciseRepos ;;
106	+ 4\|5\|6\|7) conciseRepos ;;
107	esac
108
109	bootload
110	@@ -462,10 +480,11 @@ archlinuxinstall yay-bin
111	case $edition in
112	1) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/dwm.csv" && configChoice="dwm" ;;
113	2) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/plasma.csv" && configChoice="plasma" ;;
114	- 3) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-plasma.csv" && configChoice="bare-plasma" ;;
115	- 4) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-gnome.csv" && configChoice="bare-gnome" ;;
116	- 5) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-xfce.csv" && configChoice="bare-xfce" ;;
117	- 6) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare.csv" && configChoice="bare" ;;
118	+ 3) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/server-suite.csv" && configChoice="server" ;;
119	+ 4) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-plasma.csv" && configChoice="bare-plasma" ;;
120	+ 5) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-gnome.csv" && configChoice="bare-gnome" ;;
121	+ 6) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-xfce.csv" && configChoice="bare-xfce" ;;
122	+ 7) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare.csv" && configChoice="bare" ;;
123	esac
124
125	case $kernel in
126	@@ -477,18 +496,20 @@ esac
127
128
129	for x in $kernelChoice ; do
130	- dialog --title "$TITLE" --infobox "\\nInstalling the "$x" kernel..." 5 70 && installpkg "$x"
131	- dialog --title "$TITLE" --infobox "\\nInstalling the "$x" headers..." 5 70 && installpkg "$x"-headers
132	+ dialog --title "$TITLE" --infobox "\\nInstalling the "$x" kernel..." 4 70 && installpkg "$x"
133	+ dialog --title "$TITLE" --infobox "\\nInstalling the "$x" headers..." 4 70 && installpkg "$x"-headers
134	done
135
136	+cleanGD() { placeconfigs "$envConf" "/home/$name" "$configChoice" && rm -rf "/home/$name/.git" ; chshell ; }
137
138	-! [ $edition = '6' ] && installationloop && cpudrivers && gpudrivers
139	+case $edition in
140	+ 7) ;;
141	+ 3) installationloop ;;
142	+ 2) systembeepoff ; cleanGD ;;
143	+ 1) xftlib ; systembeepoff ; cleanGD ;;
144	+ *) installationloop ; cpudrivers ; gpudrivers ;;
145	+esac
146
147	-[ $edition = '1' ] && xftlib
148	-
149	-[ $edition = '1' ] \|\| [ $edition = '2' ] && systembeepoff && placeconfigs \
150	- "$envConf" "/home/$name" "$configChoice" && rm -rf "/home/$name/.git" && chshell
151	-
152	mkdir -p /etc/X11/xinit/xinitrc.d >/dev/null 2>&1 &&
153	[ -f /home/$name/.config/shell/profile ] && cat /home/$name/.config/shell/profile > /etc/zsh/zprofile >/dev/null 2>&1
154	[ -f /home/$name/.config/x11/xinitrc ] && cat /home/$name/.config/x11/xinitrc > /etc/X11/xinit/xinitrc >/dev/null 2>&1
155	@@ -516,7 +537,7 @@ sudo -u "$name" pulseaudio --start >/dev/null 2>&1
156
157	[ "$loader" = '0' ] && yesGrub
158
159	-[ $edition = '1' ] \|\| [ $edition = '2' ] && [ "$loader" = '0' ] && grubTheme
160	+[ $edition = '1' ] \|\| [ $edition = '2' ] && [ "$loader" = '0' ] && grubTheme && yesGrub2
161
162	finalize ; clear ; [ $edition = '1' ] \|\| [ $edition = '2' ] && skell
163

commit fec7495a834bb970129bf9fbd137f065f1b126b8

Author: Connor Etherington <[email protected]>

Date:   Fri Jun 3 21:30:30 2022 +0200

    Auto-Commit Update - 20220603

---

 PKGBUILD            |  2 +-

 usr/bin/autoInstall | 71 ++++++++++++++++++++++++++++++++++-------------------

 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index b70b7ab..ac51f00 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,7 +1,7 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=auto

-pkgver=4.3

+pkgver=4.4

 pkgrel=1

 pkgdesc='ArchLinux bootstrap and partitioning scripts, with a selection of WM and DEs'

 arch=(x86_64)

diff --git a/usr/bin/autoInstall b/usr/bin/autoInstall

index 7428285..d8e4a1a 100755

--- a/usr/bin/autoInstall

+++ b/usr/bin/autoInstall

@@ -57,10 +57,11 @@ KERNELS=(

 EDITIONS=(

   '1' 'AutoLinux - DWM Edition                     '

   '2' 'AutoLinux - Plasma Edition                  '

-  '3' 'KDE Plasma (Plasma Desktop and Apps)        '

-  '4' 'Gnome (Gnome Desktop and Apps)              '

-  '5' 'Xfce (Xfce4 Desktop and Apps)               '

-  '6' 'Bare Arch Linux (No Additional Packages)    ')

+  '3' 'AutoLinux - Server Suite Edition            '

+  '4' 'KDE Plasma (Plasma Desktop and Apps)        '

+  '5' 'Gnome (Gnome Desktop and Apps)              '

+  '6' 'Xfce (Xfce4 Desktop and Apps)               '

+  '7' 'Bare Arch Linux (No Additional Packages)    ')

 installpkg(){ pacman --noconfirm --needed -S "$*" >/dev/null 2>&1 ; }

@@ -173,7 +174,15 @@ addConcise(){

 [concise]

 SigLevel = Required DatabaseOptional

-Server = https://gitlab.com/a4to/\$repo/-/raw/master/\$arch

+Include = /etc/pacman.d/concise-mirrorlist

+EOF

+cat <<-EOF > /etc/pacman.d/concise-mirrorlist

+Server = https://gitlab.com/a4to/concise/-/raw/master/x86_64/

+Server = https://concise.cc/concise/

EOF

  pacman-key --init >/dev/null 2>&1

@@ -340,17 +349,17 @@ dialog --infobox "Setting System Information..." 4 40 ; sleep 2

 case $edition in

   1) systemctl enable mpd.service >/dev/null 2>&1  ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

   2) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

-  3) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

-  4) systemctl enable gdm.service >/dev/null 2>&1  ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

-  5) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

+  4) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

+  5) systemctl enable gdm.service >/dev/null 2>&1  ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

+  6) systemctl enable sddm.service >/dev/null 2>&1 ; systemctl enable NetworkManager.service >/dev/null 2>&1 ;;

 esac

 case $edition in

-  1|2) hostname="AutoLinux" ; grep -q "ILoveCandy" /etc/pacman.conf ||

+  1|2|3) hostname="AutoLinux" ; grep -q "ILoveCandy" /etc/pacman.conf ||[41m

     sed -i "/^\[options\]/aILoveCandy" /etc/pacman.conf ;

-    sed -i "/^#ParallelDownloads = .*/ParallelDownloads = 10/;s/^#Color$/Color/" /etc/pacman.conf

+    sed -i "s/^#ParallelDownloads = .*/ParallelDownloads = 10/;s/#Color/Color/" /etc/pacman.conf

    systemctl enable bluetooth-autoconnect.service >/dev/null 2>&1 ;;

-  3|4|5|6) hostname="ArchLinux" ;;

+  4|5|6|7) hostname="ArchLinux" ;;

 esac

 ! [ -f /etc/hostname ] && echo "$hostname" > /etc/hostname

@@ -378,6 +387,15 @@ yesGrub(){ \

             grub-install --target=x86_64-efi --bootloader-id=AutoLinux --recheck >/dev/null 2>&1 ;

             grub-mkconfig -o /boot/grub/grub.cfg >/dev/null 2>&1 ; grubtheme ; }

+yesGrub2(){ \

+    dialog --infobox "Configuring Grub to Use Theming..." 4 40

+        pacman -S --noconfirm --needed grub >/dev/null 2>&1[41m

+        ! [ -d /sys/firmware/efi/efivars ] &&[41m

+            grub-install --target=i386-pc --bootloader-id=AutoLinux --force  >/dev/null 2>&1 ;

+        [ -d /sys/firmware/efi/efivars ] && pacman -S --noconfirm --needed grub efibootmgr >/dev/null 2>&1 &&

+            grub-install --target=x86_64-efi --bootloader-id=AutoLinux --recheck >/dev/null 2>&1 ;

+            grub-mkconfig -o /boot/grub/grub.cfg >/dev/null 2>&1 ; grubtheme ; }

 grubTheme(){ \

 	dialog --infobox "Setting Grub theme..." 4 30

100

     sleep 1 && mkdir -p /boot/grub/themes/AutoLinux &&

101

@@ -425,7 +443,7 @@ root_user_password || err "User exited."

102

 selKernel || err "User exited."

103

104

 case ${edition} in

105

-  3|4|5|6) conciseRepos ;;

106

+  4|5|6|7) conciseRepos ;;

107

 esac

108

109

 bootload

110

@@ -462,10 +480,11 @@ archlinuxinstall yay-bin

111

 case $edition in

112

   1) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/dwm.csv" && configChoice="dwm" ;;

113

   2) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/plasma.csv" && configChoice="plasma" ;;

114

-  3) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-plasma.csv" && configChoice="bare-plasma" ;;

115

-  4) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-gnome.csv" && configChoice="bare-gnome" ;;

116

-  5) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-xfce.csv" && configChoice="bare-xfce" ;;

117

-  6) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare.csv" && configChoice="bare" ;;

118

+  3) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/server-suite.csv" && configChoice="server" ;;

119

+  4) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-plasma.csv" && configChoice="bare-plasma" ;;

120

+  5) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-gnome.csv" && configChoice="bare-gnome" ;;

121

+  6) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare-xfce.csv" && configChoice="bare-xfce" ;;

122

+  7) pkgsfile="https://gitlab.com/a4to/auto/-/raw/editions/bare.csv" && configChoice="bare" ;;

123

 esac

124

125

 case $kernel in

126

@@ -477,18 +496,20 @@ esac

127

128

129

 for x in $kernelChoice ; do

130

-	dialog --title "$TITLE" --infobox "\\nInstalling the "$x" kernel..." 5 70 && installpkg "$x"

131

-  dialog --title "$TITLE" --infobox "\\nInstalling the "$x" headers..." 5 70 && installpkg "$x"-headers

132

+	dialog --title "$TITLE" --infobox "\\nInstalling the "$x" kernel..." 4 70 && installpkg "$x"

133

+  dialog --title "$TITLE" --infobox "\\nInstalling the "$x" headers..." 4 70 && installpkg "$x"-headers

134

 done

135

136

+cleanGD() { placeconfigs "$envConf" "/home/$name" "$configChoice" && rm -rf "/home/$name/.git" ; chshell ; }

137

138

-! [ $edition = '6' ] && installationloop && cpudrivers && gpudrivers

139

+case $edition in

140

+  7) ;;

141

+  3) installationloop ;;

142

+  2) systembeepoff ; cleanGD ;;

143

+  1) xftlib ; systembeepoff ; cleanGD ;;

144

+  *) installationloop ; cpudrivers ; gpudrivers ;;

145

+esac

146

147

-[ $edition = '1' ] && xftlib

148

149

-[ $edition = '1' ] || [ $edition = '2' ] && systembeepoff && placeconfigs \

150

- "$envConf" "/home/$name" "$configChoice" && rm -rf "/home/$name/.git" && chshell

151

152

 mkdir -p /etc/X11/xinit/xinitrc.d >/dev/null 2>&1 &&

153

     [ -f /home/$name/.config/shell/profile ] && cat /home/$name/.config/shell/profile > /etc/zsh/zprofile >/dev/null 2>&1

154

     [ -f /home/$name/.config/x11/xinitrc ] && cat /home/$name/.config/x11/xinitrc > /etc/X11/xinit/xinitrc >/dev/null 2>&1

155

@@ -516,7 +537,7 @@ sudo -u "$name" pulseaudio --start >/dev/null 2>&1

156

157

 [ "$loader" = '0' ] && yesGrub

158

159

-[ $edition = '1' ] || [ $edition = '2' ] && [ "$loader" = '0' ] && grubTheme

160

+[ $edition = '1' ] || [ $edition = '2' ] && [ "$loader" = '0' ] && grubTheme && yesGrub2

161

162

 finalize ; clear ; [ $edition = '1' ] || [ $edition = '2' ] && skell

163

auto

Logs | Files | README | README | GitLab