jkanetwork/jka-toolkit
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-02-22 13:03:49 +01:00
Code Issues Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
JoseluCross
2016-06-07 14:29:10 +02:00
parent f0dce54711 9671a75d73
commit ab992e9b28
8 changed files with 88 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jka-toolkit/apw
View File

@@ -10,7 +10,7 @@
export TEXTDOMAIN='apw' export TEXTDOMAIN='apw'
export TEXTDOMAINDIR='/usr/share/locale' export TEXTDOMAINDIR='/usr/share/locale'
#Version variable #Version variable
version="1.6.1" version="1.6.2"
#This option is for make if case insensitive #This option is for make if case insensitive
shopt -s nocasematch shopt -s nocasematch
@@ -84,6 +84,11 @@ SO=$(cat /etc/apw.conf)
#Reading packages to install/remove.. (The rest of $) , it has to be done before the option echo, logically #Reading packages to install/remove.. (The rest of $) , it has to be done before the option echo, logically
packages=$2 packages=$2
#Control the incompleted arguments
if [ -z $package ];then
echo "$(gettext "No package specified, aborting")"
exit
fi
for (( i=3; i<=$#; i++ )) for (( i=3; i<=$#; i++ ))
do do
valtmp=$(echo $* | cut -f$i -d" ") valtmp=$(echo $* | cut -f$i -d" ")

38
jka-toolkit/i18n/apw/apw.pot
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-06-06 20:17+0200\n" "POT-Creation-Date: 2016-06-07 13:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
msgid "apw - A Packager Wrapper" msgid "apw - A Packager Wrapper"
msgstr "" msgstr ""
#: apw:39 apw:258 #: apw:39 apw:263
msgid "Use apw -h for help" msgid "Use apw -h for help"
msgstr "" msgstr ""
@@ -104,64 +104,68 @@ msgid ""
"delete this file)" "delete this file)"
msgstr "" msgstr ""
#: apw:102 #: apw:89
msgid "No package specified, aborting"
msgstr ""
#: apw:107
msgid "Updating system" msgid "Updating system"
msgstr "" msgstr ""
#: apw:122 #: apw:127
msgid "Not supported on your distribution. Use -U instead" msgid "Not supported on your distribution. Use -U instead"
msgstr "" msgstr ""
#: apw:126 apw:137 #: apw:131 apw:142
msgid "You are going to install %s and dependencies" msgid "You are going to install %s and dependencies"
msgstr "" msgstr ""
#: apw:145 #: apw:150
msgid "Not supported on your distribution. Use -I instead" msgid "Not supported on your distribution. Use -I instead"
msgstr "" msgstr ""
#: apw:149 #: apw:154
msgid "You are going to reinstall %s" msgid "You are going to reinstall %s"
msgstr "" msgstr ""
#: apw:167 #: apw:172
msgid "Not supported on your distribution. Use -Ir instead" msgid "Not supported on your distribution. Use -Ir instead"
msgstr "" msgstr ""
#: apw:171 apw:181 #: apw:176 apw:186
msgid "You are going to remove %s" msgid "You are going to remove %s"
msgstr "" msgstr ""
#: apw:188 #: apw:193
msgid "Not supported on your distribution. Use -R instead" msgid "Not supported on your distribution. Use -R instead"
msgstr "" msgstr ""
#: apw:192 apw:201 #: apw:197 apw:206
msgid "Removing %s along with his dependencies that are not more in use" msgid "Removing %s along with his dependencies that are not more in use"
msgstr "" msgstr ""
#: apw:198 apw:207 apw:224 apw:234 #: apw:203 apw:212 apw:229 apw:239
msgid "Not supported on your distribution" msgid "Not supported on your distribution"
msgstr "" msgstr ""
#: apw:210 #: apw:215
msgid "Cleaning package manager" msgid "Cleaning package manager"
msgstr "" msgstr ""
#: apw:227 #: apw:232
msgid "" msgid ""
"Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY " "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY "
"ADVANCED)" "ADVANCED)"
msgstr "" msgstr ""
#: apw:237 #: apw:242
msgid "Searching %s" msgid "Searching %s"
msgstr "" msgstr ""
#: apw:246 #: apw:251
msgid "Installing files: %s" msgid "Installing files: %s"
msgstr "" msgstr ""
#: apw:257 #: apw:262
msgid "Invalid option especified" msgid "Invalid option especified"
msgstr "" msgstr ""

BIN
jka-toolkit/i18n/apw/es.mo
View File

Binary file not shown.

74
jka-toolkit/i18n/apw/es.po
View File

@@ -22,37 +22,37 @@ msgstr ""
msgid "apw - A Packager Wrapper, a Idea from JKA Network, version %s" msgid "apw - A Packager Wrapper, a Idea from JKA Network, version %s"
msgstr "apw - A Package Wrapper, una idea de JKA Network, versión %s" msgstr "apw - A Package Wrapper, una idea de JKA Network, versión %s"
#: apw:22 #: apw:23
msgid "\tUsage: apw <option> [packages]" msgid "\tUsage: apw <option> [packages]"
msgstr "\tUso: apw <opción> [paquetes]" msgstr "\tUso: apw <opción> [paquetes]"
#: apw:23 #: apw:24
msgid "\t{-h | h} \tShow this help" msgid "\t{-h | h} \tShow this help"
msgstr "\t{-h | h} \tMuestra esta ayuda" msgstr "\t{-h | h} \tMuestra esta ayuda"
#: apw:24 #: apw:25
msgid "\t{-U | U}\tUpdate system" msgid "\t{-U | U}\tUpdate system"
msgstr "\t{-U | U}\tActualiza el sistema" msgstr "\t{-U | U}\tActualiza el sistema"
#: apw:25 #: apw:26
msgid "" msgid ""
"\t{-I | I}\tInstall packages (Updates system also for preventing problems)" "\t{-I | I}\tInstall packages (Updates system also for preventing problems)"
msgstr "" msgstr ""
"\t{-I | I}\tInstala paquetes (Actualiza el sistema también para prevenir " "\t{-I | I}\tInstala paquetes (Actualiza el sistema también para prevenir "
"problemas)" "problemas)"
#: apw:26 #: apw:27
msgid "" msgid ""
"\t{-Ir | Ir}\tReinstall packages (Updates system also for preventing " "\t{-Ir | Ir}\tReinstall packages (Updates system also for preventing "
"problems)" "problems)"
msgstr "" msgstr ""
"\t{-Ir | Ir}Reinstala paquetes (Actualiza el sistema para prevenir problemas" "\t{-Ir | Ir}\tReinstala paquetes (Actualiza el sistema para prevenir problemas"
#: apw:27 #: apw:28
msgid "\t{-R | R}\tRemoves a package" msgid "\t{-R | R}\tRemoves a package"
msgstr "\t{-R | R}\tElimina un paquete" msgstr "\t{-R | R}\tElimina un paquete"
#: apw:28 #: apw:29
msgid "" msgid ""
"\t{-Rd | Rd}\tRemoves a package along with dependencies that are not more in " "\t{-Rd | Rd}\tRemoves a package along with dependencies that are not more in "
"use (Only for Arch)" "use (Only for Arch)"
@@ -60,11 +60,11 @@ msgstr ""
"\t{-Rd | Rd}\tElimina un paquete junto con sus dependencias que no serán mas " "\t{-Rd | Rd}\tElimina un paquete junto con sus dependencias que no serán mas "
"usadas (Solo para Arch)" "usadas (Solo para Arch)"
#: apw:29 #: apw:30
msgid "\t{-C | C}\tClean temp files" msgid "\t{-C | C}\tClean temp files"
msgstr "\t{-C | C}\tBorra los archivos temporales" msgstr "\t{-C | C}\tBorra los archivos temporales"
#: apw:30 #: apw:31
msgid "" msgid ""
"\t{-Cd | Cd}\tClean system from dependencies that are not in use (ADVANCED, " "\t{-Cd | Cd}\tClean system from dependencies that are not in use (ADVANCED, "
"BE CAREFUL!)" "BE CAREFUL!)"
@@ -72,11 +72,11 @@ msgstr ""
"\t{-Cd | Cd}\tBorra del sistema dependencias no usadas (AVANZADO, TEN " "\t{-Cd | Cd}\tBorra del sistema dependencias no usadas (AVANZADO, TEN "
"CUIDADO)" "CUIDADO)"
#: apw:31 #: apw:32
msgid "\t{-S | S}\tSearch in package database" msgid "\t{-S | S}\tSearch in package database"
msgstr "\t{-S | S}\tBuscar en la base de datos" msgstr "\t{-S | S}\tBuscar en la base de datos"
#: apw:32 #: apw:33
msgid "" msgid ""
"\t{-F | F}\tInstall file (distro family dependent, e.g. .deb , .pkg.tar." "\t{-F | F}\tInstall file (distro family dependent, e.g. .deb , .pkg.tar."
"xz,...)" "xz,...)"
@@ -84,33 +84,33 @@ msgstr ""
"\t{-F | F}\tInstalar archivo (depende del tipo de la distribución, ej: ." "\t{-F | F}\tInstalar archivo (depende del tipo de la distribución, ej: ."
"deb, .pkg.tar.xz,...)" "deb, .pkg.tar.xz,...)"
#: apw:33 #: apw:34
msgid "\tAppend y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations" 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" msgstr "\tAñadir y a -U o -I (-Uy -Iy -Iry) para autoconfirmar la operación"
#: apw:37 #: apw:38
msgid "apw - A Packager Wrapper" msgid "apw - A Packager Wrapper"
msgstr "apw - A Package Wrapper" msgstr "apw - A Package Wrapper"
#: apw:38 apw:250 #: apw:39 apw:263
msgid "Use apw -h for help" msgid "Use apw -h for help"
msgstr "Usa apw -h para ver la ayuda" msgstr "Usa apw -h para ver la ayuda"
#: apw:46 #: apw:47
msgid "apw has to run as root, please run as root/with sudo" 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" msgstr "apw tiene que ejecutarse como root, por favor usalo como root/sudo"
#: apw:51 #: apw:52
msgid "It's the first run of the program, we need a thing before continue" msgid "It's the first run of the program, we need a thing before continue"
msgstr "" msgstr ""
"Esta es la primera ejecución del programa, necesitamos algo antes de " "Esta es la primera ejecución del programa, necesitamos algo antes de "
"continuar" "continuar"
#: apw:52 #: apw:53
msgid "What, or in what is based your Linux?" msgid "What, or in what is based your Linux?"
msgstr "¿Qué o en qué está basado tu distribución Linux?" msgstr "¿Qué o en qué está basado tu distribución Linux?"
#: apw:53 #: apw:54
msgid "" msgid ""
"(The answer will be recorded in /etc/apw.conf, if you want to reset apw, " "(The answer will be recorded in /etc/apw.conf, if you want to reset apw, "
"delete this file)" "delete this file)"
@@ -118,51 +118,55 @@ msgstr ""
"(La respuesta será guardada en /etc/apw.conf, si quieres resetear apw borra " "(La respuesta será guardada en /etc/apw.conf, si quieres resetear apw borra "
"el fichero)" "el fichero)"
#: apw:101 #: apw:89
msgid "No package specified, aborting"
msgstr "Ningún paquete especificado, cerrando"
#: apw:107
msgid "Updating system" msgid "Updating system"
msgstr "Actualizando el sistema" msgstr "Actualizando el sistema"
#: apw:121 #: apw:127
msgid "Not supported on your distribution. Use -U instead" msgid "Not supported on your distribution. Use -U instead"
msgstr "No soportado en tu distribución. Usa -U en su lugar" msgstr "No soportado en tu distribución. Usa -U en su lugar"
#: apw:125 apw:135 #: apw:131 apw:142
msgid "You are going to install %s and dependencies" msgid "You are going to install %s and dependencies"
msgstr "Vas a instalar %s y sus dependencias" msgstr "Vas a instalar %s y sus dependencias"
#: apw:142 #: apw:150
msgid "Not supported on your distribution. Use -I instead" msgid "Not supported on your distribution. Use -I instead"
msgstr "No soportado en tu distribución. Usa -I en su lugar" msgstr "No soportado en tu distribución. Usa -I en su lugar"
#: apw:146 #: apw:154
msgid "You are going to reinstall %s" msgid "You are going to reinstall %s"
msgstr "Vas a reinstalar %s" msgstr "Vas a reinstalar %s"
#: apw:163 #: apw:172
msgid "Not supported on your distribution. Use -Ir instead" msgid "Not supported on your distribution. Use -Ir instead"
msgstr "No soportado en tu distribución. Usa -Ir en su lugar" msgstr "No soportado en tu distribución. Usa -Ir en su lugar"
#: apw:167 apw:177 #: apw:176 apw:186
msgid "You are going to remove %s" msgid "You are going to remove %s"
msgstr "Vas a borrar %s" msgstr "Vas a borrar %s"
#: apw:184 #: apw:193
msgid "Not supported on your distribution. Use -R instead" msgid "Not supported on your distribution. Use -R instead"
msgstr "No soportado en tu distribución. Usa -R en su lugar" msgstr "No soportado en tu distribución. Usa -R en su lugar"
#: apw:188 apw:196 #: apw:197 apw:206
msgid "Removing %s along with his dependencies that are not more in use" 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" msgstr "Quitando %s junto con las dependencias que no están más en uso"
#: apw:193 apw:201 apw:218 apw:228 #: apw:203 apw:212 apw:229 apw:239
msgid "Not supported on your distribution" msgid "Not supported on your distribution"
msgstr "No soportado en tu distribución" msgstr "No soportado en tu distribución"
#: apw:204 #: apw:215
msgid "Cleaning package manager" msgid "Cleaning package manager"
msgstr "Limpiar gestor de paquetes" msgstr "Limpiar gestor de paquetes"
#: apw:221 #: apw:232
msgid "" msgid ""
"Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY " "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY "
"ADVANCED)" "ADVANCED)"
@@ -170,14 +174,14 @@ msgstr ""
"Limpiar el sistema de dependencias que no están en uso (CUIDADO, SOLO " "Limpiar el sistema de dependencias que no están en uso (CUIDADO, SOLO "
"EXPERIMENTADOS)" "EXPERIMENTADOS)"
#: apw:231 #: apw:242
msgid "Searching %s" msgid "Searching %s"
msgstr "Buscando %s" msgstr "Buscando %s"
#: apw:239 #: apw:251
msgid "Installing files: %s" msgid "Installing files: %s"
msgstr "\t{-C | C}\tBorra los archivos temporales" msgstr "Instalando archivos: %s"
#: apw:249 #: apw:262
msgid "Invalid option especified" msgid "Invalid option especified"
msgstr "Opción inválida seleccionada" msgstr "Opción inválida seleccionada"

BIN
jka-toolkit/i18n/jkazip/es.mo
View File

Binary file not shown.

12
jka-toolkit/i18n/jkazip/es.po
View File

@@ -22,7 +22,7 @@ msgstr ""
msgid "%s has been decompressed" msgid "%s has been decompressed"
msgstr "%s se ha descomprimido" msgstr "%s se ha descomprimido"
#: jkazip:95 jkazip:249 #: jkazip:95 jkazip:245
msgid "Format %s unknown" msgid "Format %s unknown"
msgstr "Formato %s desconocido" msgstr "Formato %s desconocido"
@@ -83,8 +83,8 @@ msgid "\tjkazip -c \"tar.xz\" directory"
msgstr "\tjkazip -c \"tar.xz\" directorio" msgstr "\tjkazip -c \"tar.xz\" directorio"
#: jkazip:118 #: jkazip:118
msgid "\tSupported formats: tar,gzip,bzip2,xzip,7z,zip and rar" msgid "\tSupported formats: tar, gzip, bzip2, xzip, 7z, zip and rar"
msgstr "\tFormatos soportados: tar,gzip,bzip2,xzip,7z,zip y tar" msgstr "\tFormatos soportados: tar, gzip, bzip2, xzip, 7z, zip y tar"
#: jkazip:119 #: jkazip:119
msgid "" msgid ""
@@ -134,6 +134,10 @@ msgstr "%s ha sido comprimido"
msgid "No format specified" msgid "No format specified"
msgstr "Ningún formato especificado" msgstr "Ningún formato especificado"
#: jkazip:253 #: jkazip:243
msgid "Format rar are not supported for compression"
msgstr "El formato rar no está soportado para la compresión"
#: jkazip:249
msgid "Unknown option" msgid "Unknown option"
msgstr "Opción desconocida" msgstr "Opción desconocida"

12
jka-toolkit/i18n/jkazip/jkazip.pot
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-06-06 20:17+0200\n" "POT-Creation-Date: 2016-06-07 13:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
msgid "%s has been decompressed" msgid "%s has been decompressed"
msgstr "" msgstr ""
#: jkazip:95 jkazip:249 #: jkazip:95 jkazip:245
msgid "Format %s unknown" msgid "Format %s unknown"
msgstr "" msgstr ""
@@ -78,7 +78,7 @@ msgid "\tjkazip -c \"tar.xz\" directory"
msgstr "" msgstr ""
#: jkazip:118 #: jkazip:118
msgid "\tSupported formats: tar,gzip,bzip2,xzip,7z,zip and rar" msgid "\tSupported formats: tar, gzip, bzip2, xzip, 7z, zip and rar"
msgstr "" msgstr ""
#: jkazip:119 #: jkazip:119
@@ -127,6 +127,10 @@ msgstr ""
msgid "No format specified" msgid "No format specified"
msgstr "" msgstr ""
#: jkazip:253 #: jkazip:243
msgid "Format rar are not supported for compression"
msgstr ""
#: jkazip:249
msgid "Unknown option" msgid "Unknown option"
msgstr "" msgstr ""

12
jka-toolkit/jkazip
View File

@@ -86,7 +86,7 @@ function decompress() {
echo echo
fi fi
elif [ $format = "rar" ];then elif [ $format = "rar" ];then
rar -x $2 unrar x $2
if [ $? -eq 0 ];then if [ $? -eq 0 ];then
printf -- $msg_de printf -- $msg_de
echo echo
@@ -96,7 +96,7 @@ function decompress() {
echo echo
fi fi
} }
version="1.0.0" version="1.0.1"
if [ -z $1 ];then if [ -z $1 ];then
echo "$(gettext "No option specified, use jkazip -h")" echo "$(gettext "No option specified, use jkazip -h")"
elif [ $1 = "-h" ];then elif [ $1 = "-h" ];then
@@ -115,7 +115,7 @@ elif [ $1 = "-h" ];then
echo "$(gettext " jkazip -d file.7z")" echo "$(gettext " jkazip -d file.7z")"
echo "$(gettext " jkazip -c \"tar.xz\" directory")" echo "$(gettext " jkazip -c \"tar.xz\" directory")"
echo "" echo ""
echo "$(gettext " Supported formats: tar,gzip,bzip2,xzip,7z,zip and rar")" echo "$(gettext " Supported formats: tar, gzip, bzip2, xzip, 7z, zip and rar")"
echo "$(gettext " Only one file or directory (some formats don't support directories), for more options use the each program individualy")" echo "$(gettext " Only one file or directory (some formats don't support directories), for more options use the each program individualy")"
echo "" echo ""
elif [ $1 = "-v" ];then elif [ $1 = "-v" ];then
@@ -240,11 +240,7 @@ elif [ $1 = "-c" ];then
echo echo
fi fi
elif [ $2 = "rar" ] 2> /dev/null ;then elif [ $2 = "rar" ] 2> /dev/null ;then
rar -a $3.rar $3 echo "$(gettext "Format rar are not supported for compression"
if [ $? -eq 0 ];then
printf -- $msg_co
echo
fi
else else
printf -- "$(gettext "Format %s unknown")" "$2" printf -- "$(gettext "Format %s unknown")" "$2"
echo echo