From 4dbaeeab11b80b4544daf2b606a9c0136e4c697c Mon Sep 17 00:00:00 2001 From: kprkpr Date: Tue, 7 Jun 2016 15:56:31 +0200 Subject: [PATCH] New option -f --- jka-toolkit/apw | 24 +++++++++--- jka-toolkit/i18n/apw/apw.pot | 62 +++++++++++++++++-------------- jka-toolkit/i18n/apw/es.mo | Bin 4545 -> 4810 bytes jka-toolkit/i18n/apw/es.po | 70 +++++++++++++++++++---------------- 4 files changed, 92 insertions(+), 64 deletions(-) diff --git a/jka-toolkit/apw b/jka-toolkit/apw index 2e3f224..6f4f7ab 100755 --- a/jka-toolkit/apw +++ b/jka-toolkit/apw @@ -10,7 +10,7 @@ export TEXTDOMAIN='apw' export TEXTDOMAINDIR='/usr/share/locale' #Version variable -version="1.6.2" +version="1.7" #This option is for make if case insensitive shopt -s nocasematch @@ -32,6 +32,7 @@ case "$1" in echo "$(gettext " {-S | S} Search in package database")" echo "$(gettext " {-F | F} Install file (distro family dependent, e.g. .deb , .pkg.tar.xz,...)")" echo "$(gettext " Append y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations")" + echo "$(gettext " Append f to -U (-Uf) to force system update and ignore errors" exit ;; "") @@ -116,6 +117,17 @@ case "$1" in yum | dnf | zypper) $SO update;; esac;; + *Uf) + echo $(gettext "Force updating system") + case "$SO" in + apt) + apt update && apt upgrade -f;; + pacman) + pacman -Syu $packages --force;; + yum | dnf | zypper) + echo "$(gettext "Not supported on your distribution. Doing -U instead")" + $SO update;; + esac;; *Uy) echo $updating case "$SO" in @@ -124,7 +136,7 @@ case "$1" in pacman) pacman -Syu $packages --noconfirm;; yum | dnf | zypper) - echo "$(gettext "Not supported on your distribution. Use -U instead")" + echo "$(gettext "Not supported on your distribution. Doing -U instead")" $SO update;; esac;; *I) @@ -147,7 +159,7 @@ case "$1" in pacman) pacman -Syu $packages --noconfirm --needed;; yum | dnf | zypper) - echo "$(gettext "Not supported on your distribution. Use -I instead")" + echo "$(gettext "Not supported on your distribution. Doing -I instead")" $SO install $packages;; esac;; *Ir) @@ -162,14 +174,14 @@ case "$1" in $SO reinstall $packages;; esac;; *Iry) - echo "$(gettext "You are going to reinstall $packages")" + printf -- "$(gettext "You are going to reinstall %s")" "$packages" case "$SO" in apt) apt update && apt -y install --reinstall $packages;; pacman) pacman -Syu $packages --noconfirm;; yum | dnf | zypper) - echo "$(gettext "Not supported on your distribution. Use -Ir instead")" + echo "$(gettext "Not supported on your distribution. Doing -Ir instead")" $SO reinstall $packages;; esac;; *R) @@ -190,7 +202,7 @@ case "$1" in pacman) pacman -R $packages --noconfirm;; yum | dnf | zypper) - echo "$(gettext "Not supported on your distribution. Use -R instead")" + echo "$(gettext "Not supported on your distribution. Doing -R instead")" $SO remove $packages;; esac;; *Rd) diff --git a/jka-toolkit/i18n/apw/apw.pot b/jka-toolkit/i18n/apw/apw.pot index 9fc5256..1820b76 100644 --- a/jka-toolkit/i18n/apw/apw.pot +++ b/jka-toolkit/i18n/apw/apw.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-07 13:27+0200\n" +"POT-Creation-Date: 2016-06-07 15:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,94 +78,102 @@ msgstr "" msgid "\tAppend y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations" msgstr "" -#: apw:38 +#: apw:35 +msgid "\tAppend f to -U (-Uf) to force system update and ignore errors" +msgstr "" + +#: apw:39 msgid "apw - A Packager Wrapper" msgstr "" -#: apw:39 apw:263 +#: apw:40 apw:275 msgid "Use apw -h for help" msgstr "" -#: apw:47 +#: apw:48 msgid "apw has to run as root, please run as root/with sudo" msgstr "" -#: apw:52 +#: apw:53 msgid "It's the first run of the program, we need a thing before continue" msgstr "" -#: apw:53 +#: apw:54 msgid "What, or in what is based your Linux?" msgstr "" -#: apw:54 +#: apw:55 msgid "" "(The answer will be recorded in /etc/apw.conf, if you want to reset apw, " "delete this file)" msgstr "" -#: apw:89 +#: apw:90 msgid "No package specified, aborting" msgstr "" -#: apw:107 +#: apw:108 msgid "Updating system" msgstr "" -#: apw:127 -msgid "Not supported on your distribution. Use -U instead" +#: apw:121 +msgid "Force updating system" msgstr "" -#: apw:131 apw:142 +#: apw:128 apw:139 +msgid "Not supported on your distribution. Doing -U instead" +msgstr "" + +#: apw:143 apw:154 msgid "You are going to install %s and dependencies" msgstr "" -#: apw:150 -msgid "Not supported on your distribution. Use -I instead" +#: apw:162 +msgid "Not supported on your distribution. Doing -I instead" msgstr "" -#: apw:154 +#: apw:166 apw:177 msgid "You are going to reinstall %s" msgstr "" -#: apw:172 -msgid "Not supported on your distribution. Use -Ir instead" +#: apw:184 +msgid "Not supported on your distribution. Doing -Ir instead" msgstr "" -#: apw:176 apw:186 +#: apw:188 apw:198 msgid "You are going to remove %s" msgstr "" -#: apw:193 -msgid "Not supported on your distribution. Use -R instead" +#: apw:205 +msgid "Not supported on your distribution. Doing -R instead" msgstr "" -#: apw:197 apw:206 +#: apw:209 apw:218 msgid "Removing %s along with his dependencies that are not more in use" msgstr "" -#: apw:203 apw:212 apw:229 apw:239 +#: apw:215 apw:224 apw:241 apw:251 msgid "Not supported on your distribution" msgstr "" -#: apw:215 +#: apw:227 msgid "Cleaning package manager" msgstr "" -#: apw:232 +#: apw:244 msgid "" "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY " "ADVANCED)" msgstr "" -#: apw:242 +#: apw:254 msgid "Searching %s" msgstr "" -#: apw:251 +#: apw:263 msgid "Installing files: %s" msgstr "" -#: apw:262 +#: apw:274 msgid "Invalid option especified" msgstr "" diff --git a/jka-toolkit/i18n/apw/es.mo b/jka-toolkit/i18n/apw/es.mo index 2636f282462c5107779ebfabe1d3522ae727aa89..0ddd0ab8a70ec5d6db26794a24fe344b354f651c 100644 GIT binary patch delta 1152 zcmaLV-%C?r7{KwzO`X4ImTi{RYv%ev3ysQd3M-Ke#WaixF%H|AtZZj(lSqt}HxhJV z90dP`!i#7@w^`IhH(eA#H$_1Z-B#dD(f2uL1>N+*yU)AlyxV!6=Y3Z@Uv?GWw^S|( zBgSlJ4poR8#JK<;jMG7pqd1Bua1poR8{CB7@hpZbMTRkjC-D&u;ZNL*r>aCI^*Qdq z=NJ(w%2yU`1On9}7qA_pcnwE!5nJ&SZooCv{f!}!`zQ4=iU5nM)n;akkoz4|)8BXjj4 z{ls6RCKzoXS?opa%tf5w{j$Ph3~L+x2NS4AaSs#t0<~p(n*2W+K}{%w=kN~d{?DjK z5ulnFo<~|NH&GK<#u0ps`aIN35r)M+7QHxvhjF3&{Ylw1>?7X2j_U9#>L1@geen`% zs~@5!`USOJ5cxcpmuB!_2?E_BqelAxB{GoKlHNb`F1k(M>;6XJ6pX6S_wxg zbXm9xe+Tza0?du&2swyhYJyRBH4rK4?V%E{cFxutdZ0S=O4AnUVA5`Hkfl^I^)hg_ zUg=t%4(-2|=#AQA*{q#Onv^LxCO&R<#m7^-b)9l@3ESka=L_}~6P?K>t%7YVcBZE? zPR=%VF6ZR(rS9OFVC#Ul*V~iMOqGA+&R4&y>URjZlcDbN>Tal~#*3Nwm}`aNez>$2 zY7P$nn?lygS(?PGl{3?pu@Z$DYdSq^CDPAI8I!c9O+Kx;S;qEL(tS?e&&$r2e$}-F vgPEk`Mw>3jNN|?io&W!nJKyx9T6e_<-3Q_Q-mh1}hy2jkpHL~%e81v16dSJi delta 889 zcmY+?Pe_zO7{~G7?z^pTtM0z5mg}EtOU(`nuDNwlSj-}!kTw(x>5vprm#FL#w1I~L z!wxS(lz8b>m&Cn9;GtvPItU)Z=u{whkb-XYedb+)24+7q@B8k|GtWGqdOmbjwwe-4 zqIJ_d>BBLph%<41Xak;f3JZ7$=dc}@a0*xPJk}+ovp9+8a0NSX8?V^=J<%T5v6cA( zwn-JeVsM!U>zKn_Qo4WzY{7ZtLp{e)T*HI-3y)w+oivCi@i^YB%~xuE#uCpHzSMxH zF@t4nW`A8}(8GiK*oVt_06(Ig^gCK$@x9UrcHj_R!rNqP5yzPSNkxH;)l0q1XVEgT zfHSy>Wh@efJ%56o?5_<5v$%`hIMo;}^Z+f87dVaY&;rV)qty4IrE(rEBQJ3R-{VnC zam+jx&;l-_UG3xAd>t$HVwXV)djp9ebpvhTduTQB6zz|%(E|L6&6vnWsm!5$e+(@{ zCA6!0h$KjqfLj+_v+F!e-zS}MspViUQd`tEND@67yeFeCMWM+%lD6m zX}{lN7^eJ!v*Zt$)j2=#s$c3eUhGb|lfD%`%KY@~`|V&bd>fnye+0#9KKmy27w?f* AY5)KL diff --git a/jka-toolkit/i18n/apw/es.po b/jka-toolkit/i18n/apw/es.po index 59aea8d..1deb808 100644 --- a/jka-toolkit/i18n/apw/es.po +++ b/jka-toolkit/i18n/apw/es.po @@ -88,29 +88,33 @@ msgstr "" msgid "\tAppend y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations" msgstr "\tAñadir y a -U o -I (-Uy -Iy -Iry) para autoconfirmar la operación" -#: apw:38 +#: apw:35 +msgid "\tAppend f to -U (-Uf) to force system update and ignore errors" +msgstr "\tAñadir f to -U (-Uf) para forzar la actualización del sistema e ignorar los errores" + +#: apw:39 msgid "apw - A Packager Wrapper" msgstr "apw - A Package Wrapper" -#: apw:39 apw:263 +#: apw:40 apw:275 msgid "Use apw -h for help" msgstr "Usa apw -h para ver la ayuda" -#: apw:47 +#: apw:48 msgid "apw has to run as root, please run as root/with sudo" msgstr "apw tiene que ejecutarse como root, por favor usalo como root/sudo" -#: apw:52 +#: apw:53 msgid "It's the first run of the program, we need a thing before continue" msgstr "" "Esta es la primera ejecución del programa, necesitamos algo antes de " "continuar" -#: apw:53 +#: apw:54 msgid "What, or in what is based your Linux?" msgstr "¿Qué o en qué está basado tu distribución Linux?" -#: apw:54 +#: apw:55 msgid "" "(The answer will be recorded in /etc/apw.conf, if you want to reset apw, " "delete this file)" @@ -118,55 +122,59 @@ msgstr "" "(La respuesta será guardada en /etc/apw.conf, si quieres resetear apw borra " "el fichero)" -#: apw:89 +#: apw:90 msgid "No package specified, aborting" msgstr "Ningún paquete especificado, cerrando" -#: apw:107 +#: apw:108 msgid "Updating system" msgstr "Actualizando el sistema" -#: apw:127 -msgid "Not supported on your distribution. Use -U instead" -msgstr "No soportado en tu distribución. Usa -U en su lugar" +#: apw:121 +msgid "Force updating system" +msgstr "Forzando la actualización del sistema" -#: apw:131 apw:142 +#: apw:128 apw:139 +msgid "Not supported on your distribution. Doing -U instead" +msgstr "No soportado en tu distribución. Usando -U en su lugar" + +#: apw:143 apw:154 msgid "You are going to install %s and dependencies" msgstr "Vas a instalar %s y sus dependencias" -#: apw:150 -msgid "Not supported on your distribution. Use -I instead" -msgstr "No soportado en tu distribución. Usa -I en su lugar" +#: apw:162 +msgid "Not supported on your distribution. Doing -I instead" +msgstr "No soportado en tu distribución. Usando -I en su lugar" -#: apw:154 +#: apw:166 apw:177 msgid "You are going to reinstall %s" msgstr "Vas a reinstalar %s" -#: apw:172 -msgid "Not supported on your distribution. Use -Ir instead" -msgstr "No soportado en tu distribución. Usa -Ir en su lugar" +#: apw:184 +msgid "Not supported on your distribution. Doing -Ir instead" +msgstr "No soportado en tu distribución. Usando -Ir en su lugar" -#: apw:176 apw:186 +#: apw:188 apw:198 msgid "You are going to remove %s" msgstr "Vas a borrar %s" -#: apw:193 -msgid "Not supported on your distribution. Use -R instead" -msgstr "No soportado en tu distribución. Usa -R en su lugar" +#: apw:205 +msgid "Not supported on your distribution. Doing -R instead" +msgstr "No soportado en tu distribución. Usando -R en su lugar" -#: apw:197 apw:206 +#: apw:209 apw:218 msgid "Removing %s along with his dependencies that are not more in use" msgstr "Quitando %s junto con las dependencias que no están más en uso" -#: apw:203 apw:212 apw:229 apw:239 +#: apw:215 apw:224 apw:241 apw:251 msgid "Not supported on your distribution" msgstr "No soportado en tu distribución" -#: apw:215 +#: apw:227 msgid "Cleaning package manager" -msgstr "Limpiar gestor de paquetes" +msgstr "Limpiando gestor de paquetes" -#: apw:232 +#: apw:244 msgid "" "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY " "ADVANCED)" @@ -174,14 +182,14 @@ msgstr "" "Limpiar el sistema de dependencias que no están en uso (CUIDADO, SOLO " "EXPERIMENTADOS)" -#: apw:242 +#: apw:254 msgid "Searching %s" msgstr "Buscando %s" -#: apw:251 +#: apw:263 msgid "Installing files: %s" msgstr "Instalando archivos: %s" -#: apw:262 +#: apw:274 msgid "Invalid option especified" msgstr "Opción inválida seleccionada"