diff options
9 files changed, 100 insertions, 13 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 592e86e..f08266c 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh @@ -215,9 +215,7 @@ while [ option != 7 ]; do #Uncomment to allow members of group wheel to execute any command sed -i 's|[#] [%]wheel ALL=[(]ALL[)] ALL|%wheel ALL=(ALL) ALL|' /mnt/etc/sudoers - #Puts the XKBMAP, start X11 automatically and Mate desktop - echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc - chmod +x /mnt/etc/skel/.xinitrc + #Enable services cp -a ~/.scriptsInstallation/x11.sh /mnt #Enable services with systemd @@ -233,6 +231,7 @@ while [ option != 7 ]; do fi echo "userName=$(dialog --stdout --inputbox "Enter an User Name" 8 40)" >> ~/.scriptsInstallation/temporal + cp ~/.codecheck /mnt cp ~/.scriptsInstallation/temporal /mnt cp ~/.scriptsInstallation/userAccount.sh /mnt chmod +x /mnt/userAccount.sh @@ -241,6 +240,7 @@ while [ option != 7 ]; do ;; *) #Delete temporal file and umount partitions + rm -r /mnt/.codecheck rm -r /mnt/temporal umount /mnt/boot &> /dev/null umount /mnt/home &> /dev/null diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/en/userAccount.sh b/configs/mate/root-image/root/.scriptsInstallation/language/en/userAccount.sh index a9551d8..0df85f9 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/en/userAccount.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/en/userAccount.sh @@ -10,4 +10,26 @@ done useradd -m -g users -G "wheel" -s /bin/bash -p $(openssl passwd $password) ${user#*=} +if [ -x /usr/bin/setxkbmap ]; then + echo "setxkbmap $(cat /.codecheck | grep XKBMAP= | cut -d '=' -f 2)" >> /home/${user#*=}/.bashrc +fi + +if [ -x /usr/bin/gsettings ]; then + sudo -u {user#*=} \ + if [ -d /usr/share/themes/Radiance-Purple ]; then + gsettings set org.mate.interface gtk-theme 'Radiance-Purple' + gsettings set org.mate.Marco.general theme 'Radiance-Purple' + fi \ + if [ -d /usr/share/icons/RAVE-X-Dark-Purple ]; then + gsettings set org.mate.interface icon-theme 'RAVE-X-Dark-Purple' + fi \ + if [ -d /usr/share/icons/mate ]; then + gsettings set org.mate.peripherals-mouse cursor-size '18' + gsettings set org.mate.peripherals-mouse cursor-theme 'mate' + fi \ + if [ -f /etc/wallpaper.png ]; then + gsettings set org.mate.background picture-filename '/etc/wallpaper.png' + fi +fi + exit 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 3a0e542..73579e7 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/es/install.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/es/install.sh @@ -217,9 +217,7 @@ while [ option != 7 ]; do #Uncomment to allow members of group wheel to execute any command sed -i 's|[#] [%]wheel ALL=[(]ALL[)] ALL|%wheel ALL=(ALL) ALL|' /mnt/etc/sudoers - #Puts the XKBMAP, start X11 automatically and Mate desktop - echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc - chmod +x /mnt/etc/skel/.xinitrc + #Enable services cp -a ~/.scriptsInstallation/x11.sh /mnt #Enable services with systemd @@ -235,6 +233,7 @@ while [ option != 7 ]; do fi echo "userName=$(dialog --stdout --inputbox "Introduce nombre de usuario" 8 40)" >> ~/.scriptsInstallation/temporal + cp ~/.codecheck /mnt cp ~/.scriptsInstallation/temporal /mnt cp ~/.scriptsInstallation/userAccount.sh /mnt chmod +x /mnt/userAccount.sh @@ -243,6 +242,7 @@ while [ option != 7 ]; do ;; *) #Delete temporal file and umount partitions + rm -r /mnt/.codecheck rm -r /mnt/temporal umount /mnt/boot &> /dev/null umount /mnt/home &> /dev/null diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/es/userAccount.sh b/configs/mate/root-image/root/.scriptsInstallation/language/es/userAccount.sh index 4ed7437..1ab3585 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/es/userAccount.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/es/userAccount.sh @@ -10,4 +10,26 @@ done useradd -m -g users -G "wheel" -s /bin/bash -p $(openssl passwd $password) ${user#*=} +if [ -x /usr/bin/setxkbmap ]; then + echo "setxkbmap $(cat /.codecheck | grep XKBMAP= | cut -d '=' -f 2)" >> /home/${user#*=}/.bashrc +fi + +if [ -x /usr/bin/gsettings ]; then + sudo -u {user#*=} \ + if [ -d /usr/share/themes/Radiance-Purple ]; then + gsettings set org.mate.interface gtk-theme 'Radiance-Purple' + gsettings set org.mate.Marco.general theme 'Radiance-Purple' + fi \ + if [ -d /usr/share/icons/RAVE-X-Dark-Purple ]; then + gsettings set org.mate.interface icon-theme 'RAVE-X-Dark-Purple' + fi \ + if [ -d /usr/share/icons/mate ]; then + gsettings set org.mate.peripherals-mouse cursor-size '18' + gsettings set org.mate.peripherals-mouse cursor-theme 'mate' + fi \ + if [ -f /etc/wallpaper.png ]; then + gsettings set org.mate.background picture-filename '/etc/wallpaper.png' + fi +fi + exit 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 798780a..ec344ae 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/gl/install.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/gl/install.sh @@ -217,9 +217,7 @@ while [ option != 7 ]; do #Uncomment to allow members of group wheel to execute any command sed -i 's|[#] [%]wheel ALL=[(]ALL[)] ALL|%wheel ALL=(ALL) ALL|' /mnt/etc/sudoers - #Puts the XKBMAP, start X11 automatically and Mate desktop - echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc - chmod +x /mnt/etc/skel/.xinitrc + #Enable services cp -a ~/.scriptsInstallation/x11.sh /mnt #Enable services with systemd @@ -235,6 +233,7 @@ while [ option != 7 ]; do fi echo "userName=$(dialog --stdout --inputbox "Introduce un nome de usuario" 8 40)" >> ~/.scriptsInstallation/temporal + cp ~/.codecheck /mnt cp ~/.scriptsInstallation/temporal /mnt cp ~/.scriptsInstallation/userAccount.sh /mnt chmod +x /mnt/userAccount.sh @@ -243,6 +242,7 @@ while [ option != 7 ]; do ;; *) #Delete temporal file and umount partitions + rm -r /mnt/.codecheck rm -r /mnt/temporal umount /mnt/boot &> /dev/null umount /mnt/home &> /dev/null diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/gl/userAccount.sh b/configs/mate/root-image/root/.scriptsInstallation/language/gl/userAccount.sh index aa1d33a..6fa82e1 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/gl/userAccount.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/gl/userAccount.sh @@ -10,4 +10,26 @@ done useradd -m -g users -G "wheel" -s /bin/bash -p $(openssl passwd $password) ${user#*=} +if [ -x /usr/bin/setxkbmap ]; then + echo "setxkbmap $(cat /.codecheck | grep XKBMAP= | cut -d '=' -f 2)" >> /home/${user#*=}/.bashrc +fi + +if [ -x /usr/bin/gsettings ]; then + sudo -u {user#*=} \ + if [ -d /usr/share/themes/Radiance-Purple ]; then + gsettings set org.mate.interface gtk-theme 'Radiance-Purple' + gsettings set org.mate.Marco.general theme 'Radiance-Purple' + fi \ + if [ -d /usr/share/icons/RAVE-X-Dark-Purple ]; then + gsettings set org.mate.interface icon-theme 'RAVE-X-Dark-Purple' + fi \ + if [ -d /usr/share/icons/mate ]; then + gsettings set org.mate.peripherals-mouse cursor-size '18' + gsettings set org.mate.peripherals-mouse cursor-theme 'mate' + fi \ + if [ -f /etc/wallpaper.png ]; then + gsettings set org.mate.background picture-filename '/etc/wallpaper.png' + fi +fi + exit 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 7d4ad73..41dd4ad 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/pt/install.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/pt/install.sh @@ -217,9 +217,7 @@ while [ option != 7 ]; do #Uncomment to allow members of group wheel to execute any command sed -i 's|[#] [%]wheel ALL=[(]ALL[)] ALL|%wheel ALL=(ALL) ALL|' /mnt/etc/sudoers - #Puts the XKBMAP, start X11 automatically and Mate desktop - echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc - chmod +x /mnt/etc/skel/.xinitrc + #Enable services cp -a ~/.scriptsInstallation/x11.sh /mnt #Enable services with systemd @@ -235,6 +233,7 @@ while [ option != 7 ]; do fi echo "userName=$(dialog --stdout --inputbox "Insira o nome do usuário" 8 40)" >> ~/.scriptsInstallation/temporal + cp ~/.codecheck /mnt cp ~/.scriptsInstallation/temporal /mnt cp ~/.scriptsInstallation/userAccount.sh /mnt chmod +x /mnt/userAccount.sh @@ -243,6 +242,7 @@ while [ option != 7 ]; do ;; *) #Delete temporal file and umount partitions + rm -r /mnt/.codecheck rm -r /mnt/temporal umount /mnt/boot &> /dev/null umount /mnt/home &> /dev/null diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/pt/userAccount.sh b/configs/mate/root-image/root/.scriptsInstallation/language/pt/userAccount.sh index 408beba..b97eda9 100755 --- a/configs/mate/root-image/root/.scriptsInstallation/language/pt/userAccount.sh +++ b/configs/mate/root-image/root/.scriptsInstallation/language/pt/userAccount.sh @@ -10,4 +10,26 @@ done useradd -m -g users -G "wheel" -s /bin/bash -p $(openssl passwd $password) ${user#*=} +if [ -x /usr/bin/setxkbmap ]; then + echo "setxkbmap $(cat /.codecheck | grep XKBMAP= | cut -d '=' -f 2)" >> /home/${user#*=}/.bashrc +fi + +if [ -x /usr/bin/gsettings ]; then + sudo -u {user#*=} \ + if [ -d /usr/share/themes/Radiance-Purple ]; then + gsettings set org.mate.interface gtk-theme 'Radiance-Purple' + gsettings set org.mate.Marco.general theme 'Radiance-Purple' + fi \ + if [ -d /usr/share/icons/RAVE-X-Dark-Purple ]; then + gsettings set org.mate.interface icon-theme 'RAVE-X-Dark-Purple' + fi \ + if [ -d /usr/share/icons/mate ]; then + gsettings set org.mate.peripherals-mouse cursor-size '18' + gsettings set org.mate.peripherals-mouse cursor-theme 'mate' + fi \ + if [ -f /etc/wallpaper.png ]; then + gsettings set org.mate.background picture-filename '/etc/wallpaper.png' + fi +fi + exit diff --git a/configs/mate/root-image/root/.xinitrc b/configs/mate/root-image/root/.xinitrc index a68bb5b..b11f426 100644 --- a/configs/mate/root-image/root/.xinitrc +++ b/configs/mate/root-image/root/.xinitrc @@ -1,6 +1,5 @@ setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2) systemctl start NetworkManager -volumeicon & gsettings set org.mate.interface gtk-theme 'Radiance-Purple' gsettings set org.mate.Marco.general theme 'Radiance-Purple' gsettings set org.mate.interface icon-theme 'RAVE-X-Dark-Purple' |