From 8b1484a6d358662bcb0ea25e39e29a676a0a019f Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Fri, 1 Jul 2016 19:55:30 +0200 Subject: [PATCH 1/5] Repair line 87 ( before =s, now == ) --- jka-toolkit/gitdit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index ff557f4..d1658dc 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -2,7 +2,7 @@ # gitdit, a dialog interface to manage git repositories # Author: JKA Network - contacto@jkanetwork.com -VERSION="1.0.0" +VERSION="1.0.1" #First check if the user is in a git repository preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ") if [ $preOption = "Not" ];then #When it isn't only it can do git clone @@ -84,7 +84,7 @@ if [ ! -z $gitopt ];then #No canceled error=0 #If 1 aux is yet in lista array for (( i=0;i<${#lista[@]} && error==0;i++ )) do - if [ $aux =s ${lista[$i]} -o $aux = $actual2 ];then + if [ $aux == ${lista[$i]} -o $aux = $actual2 ];then error=1 fi done From 71652c67d15346102230f072f1c2903b4e28b881 Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Fri, 1 Jul 2016 19:58:19 +0200 Subject: [PATCH 2/5] Add addit, a simple managed of files with automatic enter and deleted lines (current only have alias managed). The gitdit now have in line 50 support for Untracked files --- jka-toolkit/addit | 31 +++++++++++++++++++++++++++++++ jka-toolkit/gitdit | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 jka-toolkit/addit diff --git a/jka-toolkit/addit b/jka-toolkit/addit new file mode 100644 index 0000000..3f2b307 --- /dev/null +++ b/jka-toolkit/addit @@ -0,0 +1,31 @@ +#!/bin/bash +# addit, A script to manage files with dialog +# Author: JKA Network - contacto@jkanetwork.com + +VERSION="0.1.0" +options=`dialog --stdout --menu "addit - version: $version" 0 0 6 a "Manage permanent alias"` + +case $options in + "a" ) + reop=`dialog --stdout --menu "Select option" 0 0 6 0 "Add alias" 1 "Remove alias"` + case $reop in + 0) + if [ -z "$(grep -o "if \[ -f ~/.bash_aliases \]; then" $HOME/.bashrc )" ];then + echo "ADD BY ADDIT - PERMIT USE ALIAS" >> $HOME/.bashrc + echo "if [ -f ~/.bash_aliases ]; then" >> $HOME/.bashrc + echo " . ~/.bash_aliases" >> $HOME/.bashrc + echo "fi" >> $HOME/.bashrc + fi + ali=`dialog --stdout --inputbox "Alias name to add" 0 60` + comand=`dialog --stdout --inputbox "Command" 0 60` + echo "alias $ali='$comand'" >> $HOME/.bash_aliases + echo "Restart $(tty)" + ;; + 1) + ali=`dialog --stdout --inputbox "Alias name to remove" 0 60` + sed -i '/$ali/d' $HOME/bash_aliases + echo "Restart $(tty)" + ;; + esac + ;; +esac diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index d1658dc..3613e1f 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -47,8 +47,8 @@ if [ ! -z $gitopt ];then #No canceled "p") git pull $actual;; "s") - estado=$(git status | grep -o "^Changes" ) #It need to commit something? - if [ $estado ];then #When is necesary commit + estado=$(git status | grep -oE "^Changes|^Untracked" ) #It need to commit something? + if [ "$estado" ];then #When is necesary commit commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"` if [[ -z $commit ]];then commit="changes" From be91088d677e0cfea58b122539ba14b32e6a2d5a Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Sat, 2 Jul 2016 18:21:17 +0200 Subject: [PATCH 3/5] add listing mode to jkazip --- jka-toolkit/jkazip | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/jka-toolkit/jkazip b/jka-toolkit/jkazip index 92b5a23..4c7a31f 100755 --- a/jka-toolkit/jkazip +++ b/jka-toolkit/jkazip @@ -2,7 +2,6 @@ #JKA - ZIP #A script for de/compress files and folders in many formats #Author: JKA Network - contacto@jkanetwork.com -#Function decompress(); decompress the file whith the format especified # gettext initialization export TEXTDOMAIN='jkazip' @@ -40,7 +39,7 @@ function msg2() { echo } -version="2.0.3" +version="2.3.0" if [ -z "$1" ];then echo "$(gettext "No option specified, use jkazip -h")" > /dev/stderr elif [ "$1" = "-h" ];then @@ -48,6 +47,7 @@ elif [ "$1" = "-h" ];then echo "" echo "$(gettext " -d, decompress file")" echo "$(gettext " -c , compress file")" + echo "$(gettext " -l, list all files")" echo "$(gettext " -h, show help box and exit")" echo "$(gettext " -v, show version and exit")" echo "" @@ -178,6 +178,38 @@ elif [ "$1" = "-c" ];then echo > /dev/stderr ;; esac +elif [ "$1" = "-l" ];then + if [ -z "$2" ];then + echo "$(gettext "No file or directory specified")" > /dev/stderr + exit + fi + sacaFormato $2 + case $formato in + "tar" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "tgz" | "tbz2" | "txz" | "tlz") + tar taf "$2" + ;; + "7z") + 7z l "$2" + ;; + "zip") + zip -v "$2" + "gz" ) + gzip -l "$2" + ;; + "xz") + xz -l "$2" + ;; + "bz2" | "lz" ) + echo "Not supported for listing" > /dev/stderr + ;; + "rar") + unrar v "$2" + ;; + *) + printf -- "$(gettext "File extension %s are not supported")" $formato > /dev/stderr + echo > /dev/stderr + ;; + esac else echo "$(gettext "Unknown option")" > /dev/stderr fi From 31995d4bdb38a3406c7e7ee27a4f7e71166f2df7 Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Sun, 3 Jul 2016 00:30:46 +0200 Subject: [PATCH 4/5] Repair jkazip (zip to unzip) --- jka-toolkit/jkazip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/jkazip b/jka-toolkit/jkazip index 4c7a31f..73fcdb3 100755 --- a/jka-toolkit/jkazip +++ b/jka-toolkit/jkazip @@ -192,7 +192,7 @@ elif [ "$1" = "-l" ];then 7z l "$2" ;; "zip") - zip -v "$2" + uzip -v "$2" "gz" ) gzip -l "$2" ;; From 2c0c58dafe5c36d403487a3e906dc0c3981e0203 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Mon, 4 Jul 2016 14:04:24 +0200 Subject: [PATCH 5/5] Fix unzip, again ";" --- jka-toolkit/addit | 0 jka-toolkit/jkazip | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 jka-toolkit/addit diff --git a/jka-toolkit/addit b/jka-toolkit/addit old mode 100644 new mode 100755 diff --git a/jka-toolkit/jkazip b/jka-toolkit/jkazip index 73fcdb3..92b5454 100755 --- a/jka-toolkit/jkazip +++ b/jka-toolkit/jkazip @@ -192,7 +192,8 @@ elif [ "$1" = "-l" ];then 7z l "$2" ;; "zip") - uzip -v "$2" + unzip -v "$2" + ;; "gz" ) gzip -l "$2" ;;