From 67de7e669c3d097470d6ee9c4410c2146c723036 Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Tue, 7 Jun 2016 23:42:26 +0200 Subject: [PATCH 1/3] Add lzip support, necessary repair tranlation --- jka-toolkit/jkazip | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/jka-toolkit/jkazip b/jka-toolkit/jkazip index babf248..efe5590 100755 --- a/jka-toolkit/jkazip +++ b/jka-toolkit/jkazip @@ -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 From 94d85aa6201bceddf394424346ba64703fad840e Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Wed, 8 Jun 2016 16:46:55 +0200 Subject: [PATCH 2/3] Repair translation --- jka-toolkit/apw | 4 +- jka-toolkit/i18n/apw/apw.pot | 2 +- jka-toolkit/i18n/jkazip/es.po | 59 +++++++++++++++--------------- jka-toolkit/i18n/jkazip/jkazip.pot | 58 ++++++++++++++--------------- 4 files changed, 62 insertions(+), 61 deletions(-) diff --git a/jka-toolkit/apw b/jka-toolkit/apw index f6576c9..dc462e2 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.7" +version="1.7.1" #This option is for make if case insensitive shopt -s nocasematch @@ -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 diff --git a/jka-toolkit/i18n/apw/apw.pot b/jka-toolkit/i18n/apw/apw.pot index b332d68..e5c38d1 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 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 \n" "Language-Team: LANGUAGE \n" diff --git a/jka-toolkit/i18n/jkazip/es.po b/jka-toolkit/i18n/jkazip/es.po index b1d5599..086e821 100644 --- a/jka-toolkit/i18n/jkazip/es.po +++ b/jka-toolkit/i18n/jkazip/es.po @@ -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 " msgstr "\tsinopsis:\tjkazip " -#: jkazip:105 +#: jkazip:117 msgid "\t-d,\t\tdecompress file" msgstr "\t-d,\t\tdescomprimir archivo" -#: jkazip:106 +#: jkazip:118 msgid "" "\t-f ,\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 ,\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 ,\tcompress file" msgstr "\t-c ,\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] \" or " "\"jkazip -c \" o " "\"jkazip -c \"" -#: 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" diff --git a/jka-toolkit/i18n/jkazip/jkazip.pot b/jka-toolkit/i18n/jkazip/jkazip.pot index bebbc6a..f41ffd4 100644 --- a/jka-toolkit/i18n/jkazip/jkazip.pot +++ b/jka-toolkit/i18n/jkazip/jkazip.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: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 \n" "Language-Team: LANGUAGE \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 " msgstr "" -#: jkazip:105 +#: jkazip:117 msgid "\t-d,\t\tdecompress file" msgstr "" -#: jkazip:106 +#: jkazip:118 msgid "" "\t-f ,\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 ,\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] \" or " "\"jkazip -c Date: Wed, 8 Jun 2016 16:47:47 +0200 Subject: [PATCH 3/3] update .mo --- jka-toolkit/i18n/jkazip/es.mo | Bin 3352 -> 3364 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/jka-toolkit/i18n/jkazip/es.mo b/jka-toolkit/i18n/jkazip/es.mo index e93fe8f35be145fb827a0b76205f77727a5ce951..c87bb643207bce08ca593aae17d8f4d080341f08 100644 GIT binary patch delta 454 zcmXZZJxIeq7{>AElD4$*1FTePtlCzwih_tJE=4kklbfJ}OPv%%bZ`?h3l3sCbad#} zG2q~!vxAeXf=efL(m^->M-oDQ_ddMbac|mw$G_eS14%!wbcm}dX&i5H1|KkwJzT_J z9KqSNRK#^G;Vw?#8CI~By~JjZG34p#69?PNZ11)ctQ-!-%o+Q)ee(e`)IUi7)l!j9q-?F2L+87mKeMY-mm Z*)(bf&ZH?u4d>CAqi8Jkl?K-kFyzR1h24ykJyV5&fpJv zSk6jCT*6`8z)?KFaXe4*d+ecp#TrIveTAIVht-?{m07G1OyDkB!zp&*E!u_;*l?tG zEK%1xBp>(i5>L=_FE0(^B64e;$1!f99rOba(R1VXoVkHCO>jprfNwaDUr9aG8J~C# zr^we58#qbbLi@lcw8=!cfWK(_)(Y{2HnB>5gw}tJcF>m+3me5J+63C@pk4eG6`Oxf Z-N`psQ)7<8oz$}vRx;n&u;1-Y{{x_4FD3v0