1
0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-02-15 17:41:31 +01:00

Merge remote-tracking branch 'origin/hotfix'

This commit is contained in:
JoseluCross
2016-06-08 22:34:22 +02:00
6 changed files with 94 additions and 63 deletions

View File

@@ -85,7 +85,7 @@ SO=$(cat /etc/apw.conf)
#Reading packages to install/remove.. (The rest of $) , it has to be done before the option echo, logically
packages=$2
#Control the incompleted arguments
if [[ -z $package && ( $1 != *u* && $1 != *c* ) ]];then
if [[ -z $packages && ( $1 != *u* && $1 != *c* ) ]];then
echo "$(gettext "No package specified, aborting")"
exit
fi

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-06-07 16:05+0200\n"
"POT-Creation-Date: 2016-06-08 16:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

Binary file not shown.

View File

@@ -22,23 +22,23 @@ msgstr ""
msgid "%s has been decompressed"
msgstr "%s se ha descomprimido"
#: jkazip:95 jkazip:245
#: jkazip:107 jkazip:275
msgid "Format %s unknown"
msgstr "Formato %s desconocido"
#: jkazip:101
#: jkazip:113
msgid "No option specified, use jkazip -h"
msgstr "Ninguna opción especificada, use jkazip -h"
#: jkazip:103
#: jkazip:115
msgid "\tsynopsis:\tjkazip <options> <file or directory>"
msgstr "\tsinopsis:\tjkazip <opciones> <archivo o directorio>"
#: jkazip:105
#: jkazip:117
msgid "\t-d,\t\tdecompress file"
msgstr "\t-d,\t\tdescomprimir archivo"
#: jkazip:106
#: jkazip:118
msgid ""
"\t-f <format>,\tspecified format whe decompress, necessary only when the "
"name have more than one point before the file extension"
@@ -46,19 +46,19 @@ msgstr ""
"\t-f <formato>,\tespecifica el formato cuando descomprime, necesario solo "
"cuando el nombre tiene más de un punto antes de la extensión del archivo"
#: jkazip:107
#: jkazip:119
msgid "\t-c <format>,\tcompress file"
msgstr "\t-c <formato>,\tcomprimir archivo"
#: jkazip:108
#: jkazip:120
msgid "\t-h,\t\tshow help box and exit"
msgstr "\t-h,\t\tmuestra la ayuda y termina"
#: jkazip:109
#: jkazip:121
msgid "\t-v,\t\tshow version"
msgstr "\t-v,\t\tmuestra la versión"
#: jkazip:111
#: jkazip:123
msgid ""
"\tThe order must be \"jkazip -d [-f format] <file or directory>\" or "
"\"jkazip -c <format> <file or directory\""
@@ -66,27 +66,28 @@ msgstr ""
"\tEl orden debe ser \"jkazip -d [-f formato] <archivo o directorio>\" o "
"\"jkazip -c <formato> <archivo o directorio>\""
#: jkazip:113
#: jkazip:125
msgid "\tExamples"
msgstr "\tEjemplos"
#: jkazip:114
#: jkazip:126
msgid "\tjkazip -d -f \"tar.gz\" file.txt.tar.gz"
msgstr "\tjkazip -d -f \"tar.gz\" archivo.txt.tar.gz"
#: jkazip:115
#: jkazip:127
msgid "\tjkazip -d file.7z"
msgstr "\tjkazip -d archivo.7z"
#: jkazip:116
#: jkazip:128
msgid "\tjkazip -c \"tar.xz\" directory"
msgstr "\tjkazip -c \"tar.xz\" directorio"
#: jkazip:118
msgid "\tSupported formats: tar, gzip, bzip2, xzip, 7z, zip and rar"
msgstr "\tFormatos soportados: tar, gzip, bzip2, xzip, 7z, zip y tar"
#: jkazip:130
msgid "\tSupported formats: tar, gzip, bzip2, xzip, lzip, 7z, zip and rar"
msgstr "\tFormatos soportados: tar, gzip, bzip2, xzip, lzip, 7z, zip y "
"tar"
#: jkazip:119
#: jkazip:131
msgid ""
"\tOnly one file or directory (some formats don't support directories), for "
"more options use the each program individualy"
@@ -94,50 +95,50 @@ msgstr ""
"\tSolo un fichero o directorio (algunos formatos no soportan directorios), "
"para mas opciones usar cada programa individualmente"
#: jkazip:122
#: jkazip:134
msgid "jkazip by JKA Network; version %s"
msgstr "jkazip por JKA Network; versión %s"
#: jkazip:126 jkazip:160
#: jkazip:138 jkazip:172
msgid "No file or directory specified"
msgstr "Ningún archivo o directorio especificado"
#: jkazip:132 jkazip:146
#: jkazip:144 jkazip:158
msgid "Directory %s will be decompressed"
msgstr "El directorio %s será descomprimido"
#: jkazip:138 jkazip:169
#: jkazip:150 jkazip:181
msgid "%s no such file or directory"
msgstr "%s no existe el archivo o el directorio"
#: jkazip:149
#: jkazip:161
msgid "File %s will be decompressed"
msgstr "El archivo %s será descomprimido"
#: jkazip:152
#: jkazip:164
msgid "%s no sush a file or directory"
msgstr "%s no existe el archivo o el directorio"
#: jkazip:163
#: jkazip:175
msgid "The directory %s will be compressed"
msgstr "El directorio %s será comprimido"
#: jkazip:166
#: jkazip:178
msgid "The file %s will be compressed"
msgstr "El archivo %s será comprimido"
#: jkazip:173
#: jkazip:185
msgid "%s has been compressed"
msgstr "%s ha sido comprimido"
#: jkazip:175
#: jkazip:187
msgid "No format specified"
msgstr "Ningún formato especificado"
#: jkazip:243
#: jkazip:273
msgid "Format rar are not supported for compression"
msgstr "El formato rar no está soportado para la compresión"
#: jkazip:249
#: jkazip:279
msgid "Unknown option"
msgstr "Opción desconocida"

View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-06-07 13:13+0200\n"
"POT-Creation-Date: 2016-06-08 16:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,116 +21,116 @@ msgstr ""
msgid "%s has been decompressed"
msgstr ""
#: jkazip:95 jkazip:245
#: jkazip:107 jkazip:275
msgid "Format %s unknown"
msgstr ""
#: jkazip:101
#: jkazip:113
msgid "No option specified, use jkazip -h"
msgstr ""
#: jkazip:103
#: jkazip:115
msgid "\tsynopsis:\tjkazip <options> <file or directory>"
msgstr ""
#: jkazip:105
#: jkazip:117
msgid "\t-d,\t\tdecompress file"
msgstr ""
#: jkazip:106
#: jkazip:118
msgid ""
"\t-f <format>,\tspecified format whe decompress, necessary only when the "
"name have more than one point before the file extension"
msgstr ""
#: jkazip:107
#: jkazip:119
msgid "\t-c <format>,\tcompress file"
msgstr ""
#: jkazip:108
#: jkazip:120
msgid "\t-h,\t\tshow help box and exit"
msgstr ""
#: jkazip:109
#: jkazip:121
msgid "\t-v,\t\tshow version"
msgstr ""
#: jkazip:111
#: jkazip:123
msgid ""
"\tThe order must be \"jkazip -d [-f format] <file or directory>\" or "
"\"jkazip -c <format> <file or directory\""
msgstr ""
#: jkazip:113
#: jkazip:125
msgid "\tExamples"
msgstr ""
#: jkazip:114
#: jkazip:126
msgid "\tjkazip -d -f \"tar.gz\" file.txt.tar.gz"
msgstr ""
#: jkazip:115
#: jkazip:127
msgid "\tjkazip -d file.7z"
msgstr ""
#: jkazip:116
#: jkazip:128
msgid "\tjkazip -c \"tar.xz\" directory"
msgstr ""
#: jkazip:118
msgid "\tSupported formats: tar, gzip, bzip2, xzip, 7z, zip and rar"
#: jkazip:130
msgid "\tSupported formats: tar, gzip, bzip2, xzip, lzip, 7z, zip and rar"
msgstr ""
#: jkazip:119
#: jkazip:131
msgid ""
"\tOnly one file or directory (some formats don't support directories), for "
"more options use the each program individualy"
msgstr ""
#: jkazip:122
#: jkazip:134
msgid "jkazip by JKA Network; version %s"
msgstr ""
#: jkazip:126 jkazip:160
#: jkazip:138 jkazip:172
msgid "No file or directory specified"
msgstr ""
#: jkazip:132 jkazip:146
#: jkazip:144 jkazip:158
msgid "Directory %s will be decompressed"
msgstr ""
#: jkazip:138 jkazip:169
#: jkazip:150 jkazip:181
msgid "%s no such file or directory"
msgstr ""
#: jkazip:149
#: jkazip:161
msgid "File %s will be decompressed"
msgstr ""
#: jkazip:152
#: jkazip:164
msgid "%s no sush a file or directory"
msgstr ""
#: jkazip:163
#: jkazip:175
msgid "The directory %s will be compressed"
msgstr ""
#: jkazip:166
#: jkazip:178
msgid "The file %s will be compressed"
msgstr ""
#: jkazip:173
#: jkazip:185
msgid "%s has been compressed"
msgstr ""
#: jkazip:175
#: jkazip:187
msgid "No format specified"
msgstr ""
#: jkazip:243
#: jkazip:273
msgid "Format rar are not supported for compression"
msgstr ""
#: jkazip:249
#: jkazip:279
msgid "Unknown option"
msgstr ""

View File

@@ -42,6 +42,18 @@ function decompress() {
printf -- $msg_de
echo
fi
elif [ $format2 = "lz" ];then
tar cvf $2 --lzip
if [ $? -eq 0 ];then
printf -- $msg_de
echo
fi
fi
elif [ $format = "tlz" ];then
tar cvf $2 --lzip
if [ $? -eq 0 ];then
printf -- $msg_de
echo
fi
elif [ $format = "tbz2" ];then
tar xvjf $2
@@ -50,7 +62,7 @@ function decompress() {
echo
fi
elif [ $format = "tgz" ];then
tar xvjf $2
tar xvzf $2
if [ $? -eq 0 ];then
printf -- $msg_de
echo
@@ -115,7 +127,7 @@ elif [ $1 = "-h" ];then
echo "$(gettext " jkazip -d file.7z")"
echo "$(gettext " jkazip -c \"tar.xz\" directory")"
echo ""
echo "$(gettext " Supported formats: tar, gzip, bzip2, xzip, 7z, zip and rar")"
echo "$(gettext " Supported formats: tar, gzip, bzip2, xzip, lzip, 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 ""
elif [ $1 = "-v" ];then
@@ -197,6 +209,18 @@ elif [ $1 = "-c" ];then
printf -- $msg_co
echo
fi
elif [ $2 = "tar.xz" ] 2> /dev/null ;then
tar cvf $3.tar.lz --lzip $3
if [ $? -eq 0 ];then
printf -- $msg_co
echo
fi
elif [ $2 = "tlz" ] 2> /dev/null ;then
tar cvf $3.tlz --lzip $3
if [ $? -eq 0 ];then
printf -- $msg_co
echo
fi
elif [ $2 = "tbz2" ] 2> /dev/null ;then
tar cvjf $3.tbz2 $3
if [ $? -eq 0 ];then
@@ -234,7 +258,13 @@ elif [ $1 = "-c" ];then
echo
fi
elif [ $2 = "bz2" -o $2 = "bzip2" ] 2> /dev/null ;then
bzip2 -k $3
bzip2 -9k $3
if [ $? -eq 0 ];then
printf -- $msg_co
echo
fi
elif [ $2 = "lz" -o $2 = "lzip" ] 2> /dev/null ;then
lzip -9k $3
if [ $? -eq 0 ];then
printf -- $msg_co
echo