From 1bcd5e34fd312302faf8cad6764ba62beeb7d54f Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 22 Dec 2018 16:33:28 -0300 Subject: Add archlinux32-keyring in install.sh scripts Signed-off-by: David P --- .../.scriptsInstallation/language/en/install.sh | 23 +++++++++++++--------- .../.scriptsInstallation/language/es/install.sh | 23 +++++++++++++--------- .../.scriptsInstallation/language/gl/install.sh | 23 +++++++++++++--------- .../.scriptsInstallation/language/pt/install.sh | 23 +++++++++++++--------- 4 files changed, 56 insertions(+), 36 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 2951347..7c27afc 100755 --- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/en/install.sh +++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/en/install.sh @@ -1,16 +1,21 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot +keys=(parabola archlinux) +if [ $(uname -m) = i686 ]; then + keys+=(archlinux32) +fi + if [ ! -f ~/.scriptsInstallation/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux - pacman-key --refresh-keys - case $? in - 0) touch ~/.scriptsInstallation/.pacman - ;; - *) false - ;; - esac + pacman -Sy ${keys[@]/%/-keyring} --noconfirm + pacman-key --populate ${keys[@]} + pacman-key --refresh-keys + case $? in + 0) touch ~/.scriptsInstallation/.pacman + ;; + *) false + ;; + esac fi partition(){ 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 41dbc6a..32d2a47 100755 --- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/es/install.sh +++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/es/install.sh @@ -1,16 +1,21 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot +keys=(parabola archlinux) +if [ $(uname -m) = i686 ]; then + keys+=(archlinux32) +fi + if [ ! -f ~/.scriptsInstallation/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux - pacman-key --refresh-keys - case $? in - 0) touch ~/.scriptsInstallation/.pacman - ;; - *) false - ;; - esac + pacman -Sy ${keys[@]/%/-keyring} --noconfirm + pacman-key --populate ${keys[@]} + pacman-key --refresh-keys + case $? in + 0) touch ~/.scriptsInstallation/.pacman + ;; + *) false + ;; + esac fi partition(){ 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 e663e4f..57abe22 100755 --- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/gl/install.sh +++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/gl/install.sh @@ -1,16 +1,21 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot +keys=(parabola archlinux) +if [ $(uname -m) = i686 ]; then + keys+=(archlinux32) +fi + if [ ! -f ~/.scriptsInstallation/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux - pacman-key --refresh-keys - case $? in - 0) touch ~/.scriptsInstallation/.pacman - ;; - *) false - ;; - esac + pacman -Sy ${keys[@]/%/-keyring} --noconfirm + pacman-key --populate ${keys[@]} + pacman-key --refresh-keys + case $? in + 0) touch ~/.scriptsInstallation/.pacman + ;; + *) false + ;; + esac fi partition(){ 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 ca6a356..c47cd6d 100755 --- a/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/pt/install.sh +++ b/configs/lxde-openrc/airootfs/root/.scriptsInstallation/language/pt/install.sh @@ -1,16 +1,21 @@ #!/bin/bash #Temporal is a file that contains parameters to use when access to chroot +keys=(parabola archlinux) +if [ $(uname -m) = i686 ]; then + keys+=(archlinux32) +fi + if [ ! -f ~/.scriptsInstallation/.pacman ]; then - pacman -Sy parabola-keyring archlinux-keyring --noconfirm - pacman-key --populate parabola archlinux - pacman-key --refresh-keys - case $? in - 0) touch ~/.scriptsInstallation/.pacman - ;; - *) false - ;; - esac + pacman -Sy ${keys[@]/%/-keyring} --noconfirm + pacman-key --populate ${keys[@]} + pacman-key --refresh-keys + case $? in + 0) touch ~/.scriptsInstallation/.pacman + ;; + *) false + ;; + esac fi partition(){ -- cgit v1.2.2