summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-05-24 18:55:55 -0400
committerDavid P <megver83@parabola.nu>2018-05-24 18:55:55 -0400
commitd72629e6eaee832ef41bb681100545f371751122 (patch)
tree96fde2ad674892da12f5f0417125eef1d298ff77
parentdc08407089484b5090f1f7ee7da767b731b5a46c (diff)
configs/lxde-openrc: update install scripts
Signed-off-by: David P <megver83@parabola.nu>
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/.scriptsInstallation/language/en/install.sh53
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/.scriptsInstallation/language/es/install.sh55
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/.scriptsInstallation/language/gl/install.sh57
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/.scriptsInstallation/language/pt/install.sh53
4 files changed, 107 insertions, 111 deletions
diff --git a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/en/install.sh b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/en/install.sh
index 4120079..2951347 100755
--- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/en/install.sh
+++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/en/install.sh
@@ -14,17 +14,17 @@ if [ ! -f ~/.scriptsInstallation/.pacman ]; then
fi
partition(){
-
+
#Search and show the Hard Disks to select
aux=$(ls /dev/sd?)
index=0
for i in $aux; do
hdds[$index]="${i} ${i#/*/} off"
- index=$((index+1))
+ index=$((index+1))
done
hdd=$(dialog --stdout --radiolist "Select Hard Disk" 20 70 50 ${hdds[@]})
-
+
#If exist the line delete
if (cat ~/.scriptsInstallation/temporal | grep "hdd=") &>/dev/null
then
@@ -33,7 +33,7 @@ partition(){
#And add the new line with new parameter
echo "hdd=$hdd" >> ~/.scriptsInstallation/temporal
-
+
selection=$(dialog --stdout --menu "Partitioning method" 20 70 50 \
1 "Use all disk with swap (1GB) and /" \
2 "Use gparted to customize" )
@@ -46,7 +46,7 @@ partition(){
#Create partition swap and /
parted -s $hdd -- mkpart primary 1MiB 1000MiB mkpart primary 1000MiB -1s
-
+
#Boot option partition /
parted -s $hdd -- set 2 boot on
@@ -56,7 +56,7 @@ partition(){
mkfs.ext4 ${hdd}2
mount ${hdd}2 /mnt
;;
- 2)
+ 2)
gparted $hdd
#Search and show the partitions that select before.
@@ -68,7 +68,7 @@ partition(){
done
partition=$(dialog --stdout --radiolist "Mount / Partition" 20 70 50 ${partitions[@]})
-
+
#Mount partition /
umount /mnt &> /dev/null
mount $partition /mnt
@@ -77,7 +77,7 @@ partition(){
other=0
while [ $other != 3 ]; do
other=$(dialog --stdout --menu "Mount other partition?" 20 70 50 1 "/home" 2 "/boot" 3 "No")
-
+
case $other in
1)
umount /mnt/home &> /dev/null
@@ -85,17 +85,17 @@ partition(){
mount $(dialog --stdout --radiolist "Mount /home Partition" 20 70 50 ${partitions[@]}) /mnt/home
;;
2)
- umount /mnt/boot &> /dev/null
+ umount /mnt/boot &> /dev/null
mkdir /mnt/boot &> /dev/null
mount $(dialog --stdout --radiolist "Mount /boot Partition" 20 70 50 ${partitions[@]}) /mnt/boot
;;
- *)
+ *)
other=3
;;
esac
done
;;
- esac
+ esac
}
@@ -114,7 +114,7 @@ while [ option != 7 ]; do
1)
partition
;;
- 2)
+ 2)
#Install base system
pacstrap /mnt base-openrc
pacstrap /mnt dialog
@@ -129,13 +129,13 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/temporal /mnt
cp ~/.scriptsInstallation/systemConfig.sh /mnt
chmod +x /mnt/systemConfig.sh
- arch-chroot /mnt /systemConfig.sh
- rm -r /mnt/systemConfig.sh
+ arch-chroot /mnt /systemConfig.sh
+ rm -r /mnt/systemConfig.sh
;;
- 5)
+ 5)
#Create a new username and save in temporal, to use after
if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
+ then
sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
fi
@@ -144,7 +144,7 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/userAccount.sh /mnt
chmod +x /mnt/userAccount.sh
arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
+ rm -r /mnt/userAccount.sh
;;
6)
#Packages to the X11 live
@@ -173,7 +173,6 @@ while [ option != 7 ]; do
"alsa-utils"
"networkmanager-elogind"
"network-manager-applet"
- "ath9k-htc-firmware"
"iceweasel"
"icedove"
"pidgin"
@@ -189,15 +188,15 @@ while [ option != 7 ]; do
"openrc-desktop"
"polkit-elogind"
"gvfs-mtp"
- "gvfs-gphoto2"
- "xdg-user-dirs"
- "gnome-screenshot"
+ "gphoto2"
+ "xdg-user-dirs"
+ "gnome-screenshot"
)
-
- #Install packages
- pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm
+
+ #Install packages
+ pacstrap /mnt ${packages[@]}
user=$(cat ~/.scriptsInstallation/temporal | grep "userName" )
-
+
#Copy skel in the new system and desktop's background
cp -a /etc/skel/ /mnt/etc/
cp -a /etc/wallpaper.png /mnt/etc/wallpaper.png
@@ -212,7 +211,7 @@ while [ option != 7 ]; do
#Enable services with OpenRC and configure other stuff
chmod +x /mnt/x11.sh
- arch-chroot /mnt /x11.sh
+ arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
*)
@@ -220,7 +219,7 @@ while [ option != 7 ]; do
rm -r /mnt/temporal
umount /mnt/boot &> /dev/null
umount /mnt/home &> /dev/null
- umount /mnt &> /dev/null
+ umount /mnt &> /dev/null
exit
;;
esac
diff --git a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/es/install.sh b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/es/install.sh
index 195c2a2..41dbc6a 100755
--- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/es/install.sh
+++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/es/install.sh
@@ -12,19 +12,19 @@ if [ ! -f ~/.scriptsInstallation/.pacman ]; then
;;
esac
fi
-
+
partition(){
-
+
#Search and show the Hard Disks to select
aux=$(ls /dev/sd?)
index=0
for i in $aux; do
hdds[$index]="${i} ${i#/*/} off"
- index=$((index+1))
+ index=$((index+1))
done
hdd=$(dialog --stdout --radiolist "Selecciona Disco Duro" 20 70 50 ${hdds[@]})
-
+
#If exist the line delete
if (cat ~/.scriptsInstallation/temporal | grep "hdd=") &>/dev/null
then
@@ -33,7 +33,7 @@ partition(){
#And add the new line with new parameter
echo "hdd=$hdd" >> ~/.scriptsInstallation/temporal
-
+
selection=$(dialog --stdout --menu "Metodo de Particionado" 20 70 50 \
1 "Usar todo el disco con swap (1GB) y /" \
2 "Usar gparted para personalizar" )
@@ -46,7 +46,7 @@ partition(){
#Create partition swap and /
parted -s $hdd -- mkpart primary 1MiB 1000MiB mkpart primary 1000MiB -1s
-
+
#Boot option partition /
parted -s $hdd -- set 2 boot on
@@ -56,7 +56,7 @@ partition(){
mkfs.ext4 ${hdd}2
mount ${hdd}2 /mnt
;;
- 2)
+ 2)
gparted $hdd
#Search and show the partitions that select before.
@@ -68,7 +68,7 @@ partition(){
done
partition=$(dialog --stdout --radiolist "Montar particion /" 20 70 50 ${partitions[@]})
-
+
#Mount partition /
umount /mnt &> /dev/null
mount $partition /mnt
@@ -77,7 +77,7 @@ partition(){
other=0
while [ $other != 3 ]; do
other=$(dialog --stdout --menu "¿Montar otra particion?" 20 70 50 1 "/home" 2 "/boot" 3 "No")
-
+
case $other in
1)
umount /mnt/home &> /dev/null
@@ -85,17 +85,17 @@ partition(){
mount $(dialog --stdout --radiolist "Montar particion /home" 20 70 50 ${partitions[@]}) /mnt/home
;;
2)
- umount /mnt/boot &> /dev/null
+ umount /mnt/boot &> /dev/null
mkdir /mnt/boot &> /dev/null
mount $(dialog --stdout --radiolist "Mount particion /boot" 20 70 50 ${partitions[@]}) /mnt/boot
;;
- *)
+ *)
other=3
;;
esac
done
;;
- esac
+ esac
}
@@ -114,7 +114,7 @@ while [ option != 7 ]; do
1)
partition
;;
- 2)
+ 2)
#Install base system
pacstrap /mnt base-openrc
pacstrap /mnt dialog
@@ -129,13 +129,13 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/temporal /mnt
cp ~/.scriptsInstallation/systemConfig.sh /mnt
chmod +x /mnt/systemConfig.sh
- arch-chroot /mnt /systemConfig.sh
- rm -r /mnt/systemConfig.sh
+ arch-chroot /mnt /systemConfig.sh
+ rm -r /mnt/systemConfig.sh
;;
- 5)
+ 5)
#Create a new username and save in temporal, to use after
if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
+ then
sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
fi
@@ -144,7 +144,7 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/userAccount.sh /mnt
chmod +x /mnt/userAccount.sh
arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
+ rm -r /mnt/userAccount.sh
;;
6)
#Packages to the X11 live
@@ -173,7 +173,6 @@ while [ option != 7 ]; do
"alsa-utils"
"networkmanager-elogind"
"network-manager-applet"
- "ath9k-htc-firmware"
"iceweasel"
"icedove"
"pidgin"
@@ -189,15 +188,15 @@ while [ option != 7 ]; do
"openrc-desktop"
"polkit-elogind"
"gvfs-mtp"
- "gvfs-gphoto2"
- "xdg-user-dirs"
- "gnome-screenshot"
+ "gphoto2"
+ "xdg-user-dirs"
+ "gnome-screenshot"
)
-
- #Install packages
- pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm
+
+ #Install packages
+ pacstrap /mnt ${packages[@]}
user=$(cat ~/.scriptsInstallation/temporal | grep "userName" )
-
+
#Copy skel in the new system and desktop's background
cp -a /etc/skel/ /mnt/etc/
cp -a /etc/wallpaper.png /mnt/etc/wallpaper.png
@@ -212,7 +211,7 @@ while [ option != 7 ]; do
#Enable services with OpenRC and configure other stuff
chmod +x /mnt/x11.sh
- arch-chroot /mnt /x11.sh
+ arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
*)
@@ -220,7 +219,7 @@ while [ option != 7 ]; do
rm -r /mnt/temporal
umount /mnt/boot &> /dev/null
umount /mnt/home &> /dev/null
- umount /mnt &> /dev/null
+ umount /mnt &> /dev/null
exit
;;
esac
diff --git a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/gl/install.sh b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/gl/install.sh
index 05ec262..e663e4f 100755
--- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/gl/install.sh
+++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/gl/install.sh
@@ -14,17 +14,17 @@ if [ ! -f ~/.scriptsInstallation/.pacman ]; then
fi
partition(){
-
+
#Search and show the Hard Disks to select
aux=$(ls /dev/sd?)
index=0
for i in $aux; do
hdds[$index]="${i} ${i#/*/} off"
- index=$((index+1))
+ index=$((index+1))
done
hdd=$(dialog --stdout --radiolist "Selecciona Disco Duro" 20 70 50 ${hdds[@]})
-
+
#If exist the line delete
if (cat ~/.scriptsInstallation/temporal | grep "hdd=") &>/dev/null
then
@@ -45,7 +45,7 @@ partition(){
#Create partition swap and /
parted -s $hdd -- mkpart primary 1MiB 1000MiB mkpart primary 1000MiB -1s
-
+
#Boot option partition /
parted -s $hdd -- set 2 boot on
@@ -55,7 +55,7 @@ partition(){
mkfs.ext4 ${hdd}2
mount ${hdd}2 /mnt
;;
- 2)
+ 2)
gparted $hdd
#Search and show the partitions that select before.
@@ -67,7 +67,7 @@ partition(){
done
partition=$(dialog --stdout --radiolist "Montar particion /" 20 70 50 ${partitions[@]})
-
+
#Mount partition /
umount /mnt &> /dev/null
mount $partition /mnt
@@ -76,7 +76,7 @@ partition(){
other=0
while [ $other != 3 ]; do
other=$(dialog --stdout --menu "¿Montar outra particion?" 20 70 50 1 "/home" 2 "/boot" 3 "No")
-
+
case $other in
1)
umount /mnt/home &> /dev/null
@@ -84,17 +84,17 @@ partition(){
mount $(dialog --stdout --radiolist "Montar particion /home" 20 70 50 ${partitions[@]}) /mnt/home
;;
2)
- umount /mnt/boot &> /dev/null
+ umount /mnt/boot &> /dev/null
mkdir /mnt/boot &> /dev/null
mount $(dialog --stdout --radiolist "Mount particion /boot" 20 70 50 ${partitions[@]}) /mnt/boot
;;
- *)
+ *)
other=3
;;
esac
done
;;
- esac
+ esac
}
@@ -113,7 +113,7 @@ while [ option != 7 ]; do
1)
partition
;;
- 2)
+ 2)
#Install base system
pacstrap /mnt base-openrc
pacstrap /mnt dialog
@@ -128,13 +128,13 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/temporal /mnt
cp ~/.scriptsInstallation/systemConfig.sh /mnt
chmod +x /mnt/systemConfig.sh
- arch-chroot /mnt /systemConfig.sh
- rm -r /mnt/systemConfig.sh
+ arch-chroot /mnt /systemConfig.sh
+ rm -r /mnt/systemConfig.sh
;;
- 5)
+ 5)
#Create a new username and save in temporal, to use after
if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
+ then
sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
fi
@@ -143,10 +143,10 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/userAccount.sh /mnt
chmod +x /mnt/userAccount.sh
arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
+ rm -r /mnt/userAccount.sh
;;
6)
- #Packages to the X11 live
+ #Packages to the X11 live
packages=( "xorg-server"
"xf86-input-evdev"
"xf86-input-synaptics"
@@ -172,7 +172,6 @@ while [ option != 7 ]; do
"alsa-utils"
"networkmanager-elogind"
"network-manager-applet"
- "ath9k-htc-firmware"
"iceweasel"
"icedove"
"pidgin"
@@ -187,20 +186,20 @@ while [ option != 7 ]; do
"xarchiver"
"openrc-desktop"
"polkit-elogind"
- "gvfs-mtp"
- "gvfs-gphoto2"
- "xdg-user-dirs"
- "gnome-screenshot"
+ "gvfs-mtp"
+ "gphoto2"
+ "xdg-user-dirs"
+ "gnome-screenshot"
)
-
- #Install packages
- pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm
+
+ #Install packages
+ pacstrap /mnt ${packages[@]}
user=$(cat ~/.scriptsInstallation/temporal | grep "userName" )
-
+
#Copy skel in the new system and desktop's background
cp -a /etc/skel/ /mnt/etc/
cp -a /etc/wallpaper.png /mnt/etc/wallpaper.png
-
+
#Puts the XKBMAP, start X11 automatically and icewm desktop
echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc
echo "exec startlxde" >> /mnt/etc/skel/.xinitrc
@@ -211,7 +210,7 @@ while [ option != 7 ]; do
#Enable services with OpenRC and configure other stuff
chmod +x /mnt/x11.sh
- arch-chroot /mnt /x11.sh
+ arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
*)
@@ -219,7 +218,7 @@ while [ option != 7 ]; do
rm -r /mnt/temporal
umount /mnt/boot &> /dev/null
umount /mnt/home &> /dev/null
- umount /mnt &> /dev/null
+ umount /mnt &> /dev/null
exit
;;
esac
diff --git a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/pt/install.sh b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/pt/install.sh
index 1de6c85..ca6a356 100755
--- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/pt/install.sh
+++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/pt/install.sh
@@ -14,17 +14,17 @@ if [ ! -f ~/.scriptsInstallation/.pacman ]; then
fi
partition(){
-
+
#Search and show the Hard Disks to select
aux=$(ls /dev/sd?)
index=0
for i in $aux; do
hdds[$index]="${i} ${i#/*/} off"
- index=$((index+1))
+ index=$((index+1))
done
hdd=$(dialog --stdout --radiolist "Escolha o Disco" 20 70 50 ${hdds[@]})
-
+
#If exist the line delete
if (cat ~/.scriptsInstallation/temporal | grep "hdd=") &>/dev/null
then
@@ -33,7 +33,7 @@ partition(){
#And add the new line with new parameter
echo "hdd=$hdd" >> ~/.scriptsInstallation/temporal
-
+
selection=$(dialog --stdout --menu "Método de Particionamento" 20 70 50 \
1 "Usar todo o disco com o swap (1GB) e /" \
2 "Usar o gparted para personalizar" )
@@ -46,7 +46,7 @@ partition(){
#Create partition swap and /
parted -s $hdd -- mkpart primary 1MiB 1000MiB mkpart primary 1000MiB -1s
-
+
#Boot option partition /
parted -s $hdd -- set 2 boot on
@@ -56,7 +56,7 @@ partition(){
mkfs.ext4 ${hdd}2
mount ${hdd}2 /mnt
;;
- 2)
+ 2)
gparted $hdd
#Search and show the partitions that select before.
@@ -68,7 +68,7 @@ partition(){
done
partition=$(dialog --stdout --radiolist "Montar a partição /" 20 70 50 ${partitions[@]})
-
+
#Mount partition /
umount /mnt &> /dev/null
mount $partition /mnt
@@ -77,7 +77,7 @@ partition(){
other=0
while [ $other != 3 ]; do
other=$(dialog --stdout --menu "Quer montar outra partição?" 20 70 50 1 "/home" 2 "/boot" 3 "Não")
-
+
case $other in
1)
umount /mnt/home &> /dev/null
@@ -85,17 +85,17 @@ partition(){
mount $(dialog --stdout --radiolist "Montar a partição /home" 20 70 50 ${partitions[@]}) /mnt/home
;;
2)
- umount /mnt/boot &> /dev/null
+ umount /mnt/boot &> /dev/null
mkdir /mnt/boot &> /dev/null
mount $(dialog --stdout --radiolist "Montar a partição /boot" 20 70 50 ${partitions[@]}) /mnt/boot
;;
- *)
+ *)
other=3
;;
esac
done
;;
- esac
+ esac
}
@@ -114,7 +114,7 @@ while [ option != 7 ]; do
1)
partition
;;
- 2)
+ 2)
#Install base system
pacstrap /mnt base-openrc
pacstrap /mnt dialog
@@ -129,13 +129,13 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/temporal /mnt
cp ~/.scriptsInstallation/systemConfig.sh /mnt
chmod +x /mnt/systemConfig.sh
- arch-chroot /mnt /systemConfig.sh
- rm -r /mnt/systemConfig.sh
+ arch-chroot /mnt /systemConfig.sh
+ rm -r /mnt/systemConfig.sh
;;
- 5)
+ 5)
#Create a new username and save in temporal, to use after
if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
+ then
sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
fi
@@ -144,7 +144,7 @@ while [ option != 7 ]; do
cp ~/.scriptsInstallation/userAccount.sh /mnt
chmod +x /mnt/userAccount.sh
arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
+ rm -r /mnt/userAccount.sh
;;
6)
#Packages to the X11 live
@@ -173,7 +173,6 @@ while [ option != 7 ]; do
"alsa-utils"
"networkmanager-elogind"
"network-manager-applet"
- "ath9k-htc-firmware"
"iceweasel"
"icedove"
"pidgin"
@@ -189,15 +188,15 @@ while [ option != 7 ]; do
"openrc-desktop"
"polkit-elogind"
"gvfs-mtp"
- "gvfs-gphoto2"
- "xdg-user-dirs"
- "gnome-screenshot"
+ "gphoto2"
+ "xdg-user-dirs"
+ "gnome-screenshot"
)
-
- #Install packages
- pacman -Sy -r /mnt ${packages[@]} --needed --noconfirm
+
+ #Install packages
+ pacstrap /mnt ${packages[@]}
user=$(cat ~/.scriptsInstallation/temporal | grep "userName" )
-
+
#Copy skel in the new system and desktop's background
cp -a /etc/skel/ /mnt/etc/
cp -a /etc/wallpaper.png /mnt/etc/wallpaper.png
@@ -212,7 +211,7 @@ while [ option != 7 ]; do
#Enable services with OpenRC and configure other stuff
chmod +x /mnt/x11.sh
- arch-chroot /mnt /x11.sh
+ arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
*)
@@ -220,7 +219,7 @@ while [ option != 7 ]; do
rm -r /mnt/temporal
umount /mnt/boot &> /dev/null
umount /mnt/home &> /dev/null
- umount /mnt &> /dev/null
+ umount /mnt &> /dev/null
exit
;;
esac