diff --git a/jka-toolkit/apw b/jka-toolkit/apw index 965f7b5..f649afd 100755 --- a/jka-toolkit/apw +++ b/jka-toolkit/apw @@ -209,7 +209,7 @@ case "$1" in xbps-reconfigure -f $packages esac;; R|-R) - printf -- "$(gettext "You are going to remove %s")" "$packages" + printf -- "$(gettext "You are going to remove %s\n")" "$packages" case "$SO" in apt) apt remove $packages;; diff --git a/jka-toolkit/jkazip b/jka-toolkit/jkazip index 60d6205..8b53c00 100755 --- a/jka-toolkit/jkazip +++ b/jka-toolkit/jkazip @@ -5,126 +5,49 @@ #Function decompress(); decompress the file whith the format especified # gettext initialization -export TEXTDOMAIN='jkazip' -export TEXTDOMAINDIR='/usr/share/locale' +#export TEXTDOMAIN='jkazip' +#peroexport TEXTDOMAINDIR='/usr/share/locale' -function decompress() { - if [ $files -eq 0 ];then - format=$(ls $2 | cut -f2 -d".") - format2=$(ls $2 | cut -f3 -d".") +#function sacaFormato, get the file extension to zip or unzip +function sacaFormato() { + local var=$1 + cant=$(echo $var | grep -o "\." | wc -l) + fieldPost=$(expr $cant + 1) + postform=$(echo $var | cut -f$fieldPost -d".") + preform=$(echo $var | cut -f$cant -d".") + if [[ $preform = "tar" ]];then + formato=$(echo ${preform}.${postform}) else - format=$(echo $1 | cut -f1 -d".") - format2=$(echo $1 | cut -f2 -d".") - fi - if [ $format = "tar" ];then - if [ -z $format2 ];then - tar xvf $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format2 = "gz" ];then - tar xvzf $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format2 = "bz2" ];then - tar xvjf $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format2 = "xz" ];then - tar xvJf $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format2 = "lz" ];then - tar cvf $2 --lzip - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - fi - elif [ $format = "tlz" ];then - tar cvf $2 --lzip - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "tbz2" ];then - tar xvjf $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "tgz" ];then - tar xvzf $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "txz" ];then - tar xvJf $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "7z" -o $format = "7zip" ];then - 7z e $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "zip" ];then - unzip $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "gz" -o $format = "gzip" ];then - gzip -dk $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "bz2" -o $format = "bzip" ];then - bzip2 -dk $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - elif [ $format = "rar" ];then - unrar x $2 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been decompressed")" "$2" - echo - fi - else - printf -- "$(gettext "Format %s unknown")" "$format" - echo + formato=$postform fi } -version="1.0.3" +#Function msg, print in stdout a final message +function msg() { + local var=$1 + printf -- "$(gettext "File/s %s has/have been compressed")" $var +} +#Function msg2, print in stdout a final message +function msg() { + local var=$1 + printf -- "$(gettext "File has been decompressed")" $var +} + +version="1.1.0" if [ -z $1 ];then - echo "$(gettext "No option specified, use jkazip -h")" + error "$(gettext "No option specified, use jkazip -h")" elif [ $1 = "-h" ];then echo "$(gettext " synopsis: jkazip ")" echo "" echo "$(gettext " -d, decompress file")" - echo "$(gettext " -f , specified format whe decompress, necessary only when the name have more than one point before the file extension")" - echo "$(gettext " -c , compress file")" + echo "$(gettext " -c , compress file")" echo "$(gettext " -h, show help box and exit")" - echo "$(gettext " -v, show version")" + echo "$(gettext " -v, show version and exit")" echo "" - echo "$(gettext " The order must be \"jkazip -d [-f format] \" or \"jkazip -c \" or \"jkazip -c /dev/null ;then - tar cvf $3.tar $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "tar.gz" ] 2> /dev/null ;then - tar cvzf $3.tar.gz $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "tar.bz2" ] 2> /dev/null ;then - tar cvjf $3.tar.bz2 $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "tar.xz" ] 2> /dev/null ;then - tar cvJf $3.tar.xz $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "tar.xz" ] 2> /dev/null ;then - tar cvf $3.tar.lz --lzip $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "tlz" ] 2> /dev/null ;then - tar cvf $3.tlz --lzip $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "tbz2" ] 2> /dev/null ;then - tar cvjf $3.tbz2 $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "tgz" ] 2> /dev/null ;then - tar cvjf $3.tgz $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "txz" ] 2> /dev/null ;then - tar cvJf $3.txz $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "7z" -o $2 = "7zip" ] 2> /dev/null ;then - 7z a $3.7z $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "zip" ] 2> /dev/null ;then - zip $3.zip $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "gz" -o $2 = "gzip" ] 2> /dev/null ;then - gzip -9k $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "bz2" -o $2 = "bzip2" ] 2> /dev/null ;then - bzip2 -9k $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "lz" -o $2 = "lzip" ] 2> /dev/null ;then - lzip -9k $3 - if [ $? -eq 0 ];then - printf -- "$(gettext "%s has been compressed")" "$3" - echo - fi - elif [ $2 = "rar" ] 2> /dev/null ;then - echo "$(gettext "Format rar are not supported for compression")" - else - printf -- "$(gettext "Format %s unknown")" "$2" - echo + for i in $@ + do + if [[ $i != $1 && $i != $2 ]];then + if [ ! -d $i -a ! -f $i ];then + printf -- "$(gettext "%s no such file or directory")" "$3" + echo + exit + fi + fi + done fi + files=$3 + for (( i=4; i<=$#; i++)) + do + files="$files $(echo $* | cut -f$i -d" ")" + done + sacaFormato $salida + case $formato in + "tar" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "tgz" | "tbz" | "txz" | "tlz") + tar cvfa $salida $files + msg $files + ;; + "7z") + 7z a $salida $files + msg $files + ;; + "zip") + zip $salida $files + msg $files + ;; + "gz" | "lz") + formato="${formato}ip" + $formato -9kc $3 > $salida + msg $3 + ;; + "xz") + $formato -9kc $3 > $salida + msg $3 + ;; + "bz2") + $formato -9kc $3 > $salida + msg $3 + ;; + "rar") + error "$(gettext "rar compression are not supported")" + ;; + *) + error "$(gettext "File extension %s are not supported")" $formato + ;; + esac else echo "$(gettext "Unknown option")" -fi +fi \ No newline at end of file