From bfb2084b0d28dfb090192a62418c64429d408347 Mon Sep 17 00:00:00 2001 From: Erazem Kokot Date: Mon, 13 Apr 2020 19:50:00 +0200 Subject: [PATCH] Wallpaper and translation cleanup * Update language.sh with new paths to translation files * Fix updating anarchy since wallpapers are now in the main repo --- etc/anarchy.conf | 9 +-------- lib/language.sh | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/etc/anarchy.conf b/etc/anarchy.conf index 8f0f1dd0..acadc45b 100644 --- a/etc/anarchy.conf +++ b/etc/anarchy.conf @@ -118,28 +118,21 @@ config() { ;; -u|--update) tmp_dir=$(mktemp -d) - wallpaper_dir=$(mktemp -d) echo -ne "\n${Yellow}*> Anarchy: Downloading..." wget -q -4 --no-check-certificate -O ${tmp_dir}/master.tar.gz https://github.com/AnarchyLinux/installer/archive/master.tar.gz if [ "$?" -gt "0" ]; then echo -e "${Red}*> Error: ${Yellow}Active network connection not detected - Please connect to the internet and try again. Exiting..." exit 2 fi - wget -q -4 --no-check-certificate -O ${wallpaper_dir}/master.tar.gz https://github.com/AnarchyLinux/branding/archive/master.tar.gz - if [ "$?" -gt "0" ]; then - echo -e "${Red}*> Error: ${Yellow}Active network connection not detected - Please connect to the internet and try again. Exiting..." - exit 2 - fi echo -e "${Green}done" echo -ne "\n${Yellow}*> Anarchy: Updating..." tar zxf ${tmp_dir}/master.tar.gz -C ${tmp_dir} &> /dev/null - tar zxf ${wallpaper_dir}/master.tar.gz -C ${wallpaper_dir} &> /dev/null cp ${tmp_dir}/installer-master/anarchy-installer.sh /usr/bin/anarchy cp ${tmp_dir}/installer-master/etc/anarchy.conf /etc/anarchy.conf cp ${tmp_dir}/installer-master/lib/* /usr/lib/anarchy/ cp ${tmp_dir}/installer-master/lang/* /usr/share/anarchy/lang/ - cp "${wallpaper_dir}"/branding-master/wallpapers/* /usr/share/anarchy/extra/wallpapers/ + cp ${tmp_dir}/installer-master/wallpapers/* /usr/share/anarchy/extra/wallpapers/ cp -f ${tmp_dir}/installer-master/extra/{sysinfo,iptest} /usr/bin/ cp -r ${tmp_dir}/installer-master/extra/* /usr/share/anarchy/extra/ echo -e "${Green}done" diff --git a/lib/language.sh b/lib/language.sh index f438c5a7..f2872ea0 100644 --- a/lib/language.sh +++ b/lib/language.sh @@ -40,24 +40,24 @@ language() { "Swedish" "Svenska" 3>&1 1>&2 2>&3) case "$ILANG" in - "English") export lang_file="${anarchy_directory}"/lang/anarchy-english.conf ;; - "Bulgarian") export lang_file="${anarchy_directory}"/lang/anarchy-bulgarian.conf lib=bg bro=bg ;; - "Dutch") export lang_file="${anarchy_directory}"/lang/anarchy-dutch.conf lib=nl bro=nl ;; - "French") export lang_file="${anarchy_directory}"/lang/anarchy-french.conf lib=fr bro=fr ;; - "German") export lang_file="${anarchy_directory}"/lang/anarchy-german.conf lib=de bro=de ;; - "Greek") export lang_file="${anarchy_directory}"/lang/anarchy-greek.conf lib=el bro=el ;; - "Hungarian") export lang_file="${anarchy_directory}"/lang/anarchy-hungarian.conf lib=hu bro=hu ;; - "Indonesian") export lang_file="${anarchy_directory}"/lang/anarchy-indonesia.conf lib=id bro=id ;; - "Italian") export lang_file="${anarchy_directory}"/lang/anarchy-italian.conf lib=it bro=it ;; - "Latvian") export lang_file="${anarchy_directory}"/lang/anarchy-latvian.conf lib=lv bro=lv ;; - "Lithuanian") export lang_file="${anarchy_directory}"/lang/anarchy-lithuanian.conf lib=lt bro=lt ;; - "Polish") export lang_file="${anarchy_directory}"/lang/anarchy-polish.conf lib=pl bro=pl ;; - "Portuguese") export lang_file="${anarchy_directory}"/lang/anarchy-portuguese.conf lib=pt bro=pt-pt ;; - "Portuguese-Brazilian") export lang_file="${anarchy_directory}"/lang/anarchy-portuguese-br.conf lib=pt-br bro=pt-br ;; - "Romanian") export lang_file="${anarchy_directory}"/lang/anarchy-romanian.conf lib=ro bro=ro ;; - "Russian") export lang_file="${anarchy_directory}"/lang/anarchy-russian.conf lib=ru bro=ru ;; - "Spanish") export lang_file="${anarchy_directory}"/lang/anarchy-spanish.conf lib=es bro=es-es ;; - "Swedish") export lang_file="${anarchy_directory}"/lang/anarchy-swedish.conf lib=sv bro=sv-se ;; + "English") export lang_file="${anarchy_directory}"/lang/english.conf ;; + "Bulgarian") export lang_file="${anarchy_directory}"/lang/bulgarian.conf lib=bg bro=bg ;; + "Dutch") export lang_file="${anarchy_directory}"/lang/dutch.conf lib=nl bro=nl ;; + "French") export lang_file="${anarchy_directory}"/lang/french.conf lib=fr bro=fr ;; + "German") export lang_file="${anarchy_directory}"/lang/german.conf lib=de bro=de ;; + "Greek") export lang_file="${anarchy_directory}"/lang/greek.conf lib=el bro=el ;; + "Hungarian") export lang_file="${anarchy_directory}"/lang/hungarian.conf lib=hu bro=hu ;; + "Indonesian") export lang_file="${anarchy_directory}"/lang/indonesia.conf lib=id bro=id ;; + "Italian") export lang_file="${anarchy_directory}"/lang/italian.conf lib=it bro=it ;; + "Latvian") export lang_file="${anarchy_directory}"/lang/latvian.conf lib=lv bro=lv ;; + "Lithuanian") export lang_file="${anarchy_directory}"/lang/lithuanian.conf lib=lt bro=lt ;; + "Polish") export lang_file="${anarchy_directory}"/lang/polish.conf lib=pl bro=pl ;; + "Portuguese") export lang_file="${anarchy_directory}"/lang/portuguese.conf lib=pt bro=pt-pt ;; + "Portuguese-Brazilian") export lang_file="${anarchy_directory}"/lang/portuguese-br.conf lib=pt-br bro=pt-br ;; + "Romanian") export lang_file="${anarchy_directory}"/lang/romanian.conf lib=ro bro=ro ;; + "Russian") export lang_file="${anarchy_directory}"/lang/russian.conf lib=ru bro=ru ;; + "Spanish") export lang_file="${anarchy_directory}"/lang/spanish.conf lib=es bro=es-es ;; + "Swedish") export lang_file="${anarchy_directory}"/lang/swedish.conf lib=sv bro=sv-se ;; esac }