summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigs/mate/root-image/root/.scriptsInstallation/language/en/install.sh36
-rwxr-xr-xconfigs/mate/root-image/root/.scriptsInstallation/language/es/install.sh36
-rwxr-xr-xconfigs/mate/root-image/root/.scriptsInstallation/language/gl/install.sh36
-rwxr-xr-xconfigs/mate/root-image/root/.scriptsInstallation/language/pt/install.sh36
4 files changed, 68 insertions, 76 deletions
diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh b/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
index 9ca0c60..592e86e 100755
--- a/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
+++ b/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
@@ -98,8 +98,8 @@ while [ option != 7 ]; do
2 "Install Base System" \
3 "Install GRUB" \
4 "System Configure" \
- 5 "Create User Account" \
- 6 "(Optional) Install Live DVD Desktop/Applications" \
+ 5 "(Optional) Install Live DVD Desktop/Applications" \
+ 6 "Create User Account" \
7 "Exit" )
case $option in
@@ -126,21 +126,7 @@ while [ option != 7 ]; do
arch-chroot /mnt /systemConfig.sh
rm -r /mnt/systemConfig.sh
;;
- 5)
- #Create a new username and save in temporal, to use after
- if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
- sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
- fi
-
- echo "userName=$(dialog --stdout --inputbox "Enter an User Name" 8 40)" >> ~/.scriptsInstallation/temporal
- cp ~/.scriptsInstallation/temporal /mnt
- cp ~/.scriptsInstallation/userAccount.sh /mnt
- chmod +x /mnt/userAccount.sh
- arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
- ;;
- 6)
+ 5)
#Packages to the X11 live
packages=( "xorg-server"
"xf86-input-evdev"
@@ -231,8 +217,6 @@ while [ option != 7 ]; do
#Puts the XKBMAP, start X11 automatically and Mate desktop
echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc
- echo "exec mate-session" >> /mnt/etc/skel/.xinitrc
- echo "startx" >> /mnt/etc/skel/.bash_profile
chmod +x /mnt/etc/skel/.xinitrc
cp -a ~/.scriptsInstallation/x11.sh /mnt
@@ -241,6 +225,20 @@ while [ option != 7 ]; do
arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
+ 6)
+ #Create a new username and save in temporal, to use after
+ if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
+ then
+ sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
+ fi
+
+ echo "userName=$(dialog --stdout --inputbox "Enter an User Name" 8 40)" >> ~/.scriptsInstallation/temporal
+ cp ~/.scriptsInstallation/temporal /mnt
+ cp ~/.scriptsInstallation/userAccount.sh /mnt
+ chmod +x /mnt/userAccount.sh
+ arch-chroot /mnt /userAccount.sh
+ rm -r /mnt/userAccount.sh
+ ;;
*)
#Delete temporal file and umount partitions
rm -r /mnt/temporal
diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/es/install.sh b/configs/mate/root-image/root/.scriptsInstallation/language/es/install.sh
index 0f7a7f8..3a0e542 100755
--- a/configs/mate/root-image/root/.scriptsInstallation/language/es/install.sh
+++ b/configs/mate/root-image/root/.scriptsInstallation/language/es/install.sh
@@ -98,8 +98,8 @@ while [ option != 7 ]; do
2 "Instalar Sistema Base" \
3 "Instalar GRUB" \
4 "Configuración del Sistema" \
- 5 "Crear Cuenta de Usuario" \
- 6 "(Opcional) Instalar Escritorio/Aplicaciones del Live DVD" \
+ 5 "(Opcional) Instalar Escritorio/Aplicaciones del Live DVD" \
+ 6 "Crear Cuenta de Usuario" \
7 "Salir" )
case $option in
@@ -126,21 +126,7 @@ while [ option != 7 ]; do
arch-chroot /mnt /systemConfig.sh
rm -r /mnt/systemConfig.sh
;;
- 5)
- #Create a new username and save in temporal, to use after
- if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
- sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
- fi
-
- echo "userName=$(dialog --stdout --inputbox "Introduce nombre de usuario" 8 40)" >> ~/.scriptsInstallation/temporal
- cp ~/.scriptsInstallation/temporal /mnt
- cp ~/.scriptsInstallation/userAccount.sh /mnt
- chmod +x /mnt/userAccount.sh
- arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
- ;;
- 6)
+ 5)
#Packages to the X11 live
packages=( "xorg-server"
"xf86-input-evdev"
@@ -233,8 +219,6 @@ while [ option != 7 ]; do
#Puts the XKBMAP, start X11 automatically and Mate desktop
echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc
- echo "exec mate-session" >> /mnt/etc/skel/.xinitrc
- echo "startx" >> /mnt/etc/skel/.bash_profile
chmod +x /mnt/etc/skel/.xinitrc
cp -a ~/.scriptsInstallation/x11.sh /mnt
@@ -243,6 +227,20 @@ while [ option != 7 ]; do
arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
+ 6)
+ #Create a new username and save in temporal, to use after
+ if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
+ then
+ sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
+ fi
+
+ echo "userName=$(dialog --stdout --inputbox "Introduce nombre de usuario" 8 40)" >> ~/.scriptsInstallation/temporal
+ cp ~/.scriptsInstallation/temporal /mnt
+ cp ~/.scriptsInstallation/userAccount.sh /mnt
+ chmod +x /mnt/userAccount.sh
+ arch-chroot /mnt /userAccount.sh
+ rm -r /mnt/userAccount.sh
+ ;;
*)
#Delete temporal file and umount partitions
rm -r /mnt/temporal
diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/gl/install.sh b/configs/mate/root-image/root/.scriptsInstallation/language/gl/install.sh
index 5f4d92c..798780a 100755
--- a/configs/mate/root-image/root/.scriptsInstallation/language/gl/install.sh
+++ b/configs/mate/root-image/root/.scriptsInstallation/language/gl/install.sh
@@ -98,8 +98,8 @@ while [ option != 7 ]; do
2 "Instalar Sistema Base" \
3 "Instalar GRUB" \
4 "Configuración do Sistema" \
- 5 "Crear Conta de Usuario" \
- 6 "(Opcional) Instalar Escritorio/Aplicaciones de Live DVD" \
+ 5 "(Opcional) Instalar Escritorio/Aplicaciones de Live DVD" \
+ 6 "Crear Conta de Usuario" \
7 "Salir" )
case $option in
@@ -126,21 +126,7 @@ while [ option != 7 ]; do
arch-chroot /mnt /systemConfig.sh
rm -r /mnt/systemConfig.sh
;;
- 5)
- #Create a new username and save in temporal, to use after
- if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
- sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
- fi
-
- echo "userName=$(dialog --stdout --inputbox "Introduce un nome de usuario" 8 40)" >> ~/.scriptsInstallation/temporal
- cp ~/.scriptsInstallation/temporal /mnt
- cp ~/.scriptsInstallation/userAccount.sh /mnt
- chmod +x /mnt/userAccount.sh
- arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
- ;;
- 6)
+ 5)
#Packages to the X11 live
packages=( "xorg-server"
"xf86-input-evdev"
@@ -233,8 +219,6 @@ while [ option != 7 ]; do
#Puts the XKBMAP, start X11 automatically and Mate desktop
echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc
- echo "exec mate-session" >> /mnt/etc/skel/.xinitrc
- echo "startx" >> /mnt/etc/skel/.bash_profile
chmod +x /mnt/etc/skel/.xinitrc
cp -a ~/.scriptsInstallation/x11.sh /mnt
@@ -243,6 +227,20 @@ while [ option != 7 ]; do
arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
+ 6)
+ #Create a new username and save in temporal, to use after
+ if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
+ then
+ sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
+ fi
+
+ echo "userName=$(dialog --stdout --inputbox "Introduce un nome de usuario" 8 40)" >> ~/.scriptsInstallation/temporal
+ cp ~/.scriptsInstallation/temporal /mnt
+ cp ~/.scriptsInstallation/userAccount.sh /mnt
+ chmod +x /mnt/userAccount.sh
+ arch-chroot /mnt /userAccount.sh
+ rm -r /mnt/userAccount.sh
+ ;;
*)
#Delete temporal file and umount partitions
rm -r /mnt/temporal
diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/pt/install.sh b/configs/mate/root-image/root/.scriptsInstallation/language/pt/install.sh
index eb8e88c..7d4ad73 100755
--- a/configs/mate/root-image/root/.scriptsInstallation/language/pt/install.sh
+++ b/configs/mate/root-image/root/.scriptsInstallation/language/pt/install.sh
@@ -98,8 +98,8 @@ while [ option != 7 ]; do
2 "Instalar o Sistema Base" \
3 "Instalar o GRUB" \
4 "Configuração do Sistema" \
- 5 "Adicionar uma Conta de Usuário" \
- 6 "(Opcional) Instalar Ambiente Gráfico/Aplicativos da Live DVD" \
+ 5 "(Opcional) Instalar Ambiente Gráfico/Aplicativos da Live DVD" \
+ 6 "Adicionar uma Conta de Usuário" \
7 "Sair" )
case $option in
@@ -126,21 +126,7 @@ while [ option != 7 ]; do
arch-chroot /mnt /systemConfig.sh
rm -r /mnt/systemConfig.sh
;;
- 5)
- #Create a new username and save in temporal, to use after
- if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
- sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
- fi
-
- echo "userName=$(dialog --stdout --inputbox "Insira o nome do usuário" 8 40)" >> ~/.scriptsInstallation/temporal
- cp ~/.scriptsInstallation/temporal /mnt
- cp ~/.scriptsInstallation/userAccount.sh /mnt
- chmod +x /mnt/userAccount.sh
- arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
- ;;
- 6)
+ 5)
#Packages to the X11 live
packages=( "xorg-server"
"xf86-input-evdev"
@@ -233,8 +219,6 @@ while [ option != 7 ]; do
#Puts the XKBMAP, start X11 automatically and Mate desktop
echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc
- echo "exec mate-session" >> /mnt/etc/skel/.xinitrc
- echo "startx" >> /mnt/etc/skel/.bash_profile
chmod +x /mnt/etc/skel/.xinitrc
cp -a ~/.scriptsInstallation/x11.sh /mnt
@@ -243,6 +227,20 @@ while [ option != 7 ]; do
arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
+ 6)
+ #Create a new username and save in temporal, to use after
+ if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
+ then
+ sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
+ fi
+
+ echo "userName=$(dialog --stdout --inputbox "Insira o nome do usuário" 8 40)" >> ~/.scriptsInstallation/temporal
+ cp ~/.scriptsInstallation/temporal /mnt
+ cp ~/.scriptsInstallation/userAccount.sh /mnt
+ chmod +x /mnt/userAccount.sh
+ arch-chroot /mnt /userAccount.sh
+ rm -r /mnt/userAccount.sh
+ ;;
*)
#Delete temporal file and umount partitions
rm -r /mnt/temporal
generated by cgit v1.2.2 (git 2.25.0) at 2024-04-19 09:33:58 +0000