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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
JKA Network
2016-06-28 20:10:29 +02:00
parent fa551d3917 ec93689e16
commit bc6cbea65e
3 changed files with 120 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
jka-toolkit/gitdit
View File

@@ -1,31 +1,63 @@
#!/bin/bash #!/bin/bash
VERSION="0.1.1" VERSION="0.2.0"
gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" s "Subir actualizaciones al git (Hacer push)" c "Descargar un nuevo git (Hacer clone)" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge)"` gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" c "Descargar un nuevo git (Hacer clone)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge a la rama actual)"`
actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
case $gitopt in case $gitopt in
"p") git pull;; "p") git pull $actual;;
"s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50` "s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"`
if [[ -z $commit ]];then if [[ -z $commit ]];then
commit="changes" commit="changes"
fi fi
git add . && git commit -m "$commit" && git push git add . && git commit -m "$commit" && git push $actual
;; ;;
"c") "c")
giturl=`dialog --stdout --inputbox "URL del git" 10 60` giturl=`dialog --stdout --inputbox "URL del git" 10 60`
git clone $giturl git clone $giturl
;; ;;
"t")
commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"`
if [[ -z $commit ]];then
commit="changes"
fi
git add . && git commit -m "$commit"
;;
"b") "b")
gitbranch=`dialog --stdout --inputbox "Nueva rama/branch" 10 60` j=0
git checkout $gitbranch rama=""
for i in $(git branch --list | grep "^*" -v )
do
if [ $i != "*" ];then
rama="$rama $j $i"
lista[$j]=$i
let j++
fi
done
ramificacion=`dialog --stdout --scrollbar --menu "Selecione la rama a saltar" 0 0 6 $rama`
if [ ! -z $ramificacion ];then
git checkout ${lista[$ramificacion]}
fi
;;
"n")
NewBranch=`dialog --stdout --inputbox "Nombre de la nueva rama" 10 50 "new branch"`
if [ ! -z $NewBranch ];then
git checkout -b $NewBranch
fi
;; ;;
"m") "m")
until [[ $gitbusing && $gitbmerge ]] j=0
rama=""
for i in $(git branch --list | grep "^*" -v )
do do
gitbusing=`dialog --stdout --inputbox "Rama actual" 10 60` if [ $i != "*" ];then
gitbmerge=`dialog --stdout --inputbox "Rama con la que unir (la final,normalmente master)" 10 60` rama="$rama $j $i"
lista[$j]=$i
let j++
fi
done done
git checkout $gitbmerge merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir a $(git branch --list | grep "^*" | cut -f2 -d" ")" 0 0 6 $rama`
git merge $gitbusing if [ ! -z $merges ];then
git push git merge ${lista[$merges]}
git push
fi
;; ;;
esac esac

131
jka-toolkit/jkazip
View File

@@ -28,22 +28,22 @@ function sacaFormato() {
} }
#Function msg, print in stdout a final message #Function msg, print in stdout a final message
function msg() { function msg() {
local var=$1 local var="$1"
local var2=$2 local var2="$2"
printf -- "$(gettext "File/s %s has/have been compressed in %s")" $var $var2 printf -- "$(gettext "File/s %s has/have been compressed in %s")" "$var" "$var2"
echo echo
} }
#Function msg2, print in stdout a final message #Function msg2, print in stdout a final message
function msg2() { function msg2() {
local var=$1 local var="$1"
printf -- "$(gettext "File %s has been decompressed")" $var printf -- "$(gettext "File %s has been decompressed")" "$var"
echo echo
} }
version="2.0.2" version="2.0.3"
if [ -z $1 ];then if [ -z "$1" ];then
echo "$(gettext "No option specified, use jkazip -h")" > /dev/stderr echo "$(gettext "No option specified, use jkazip -h")" > /dev/stderr
elif [ $1 = "-h" ];then elif [ "$1" = "-h" ];then
echo "$(gettext " synopsis: jkazip <options> <file or directory>")" echo "$(gettext " synopsis: jkazip <options> <file or directory>")"
echo "" echo ""
echo "$(gettext " -d, decompress file")" echo "$(gettext " -d, decompress file")"
@@ -59,14 +59,14 @@ elif [ $1 = "-h" ];then
echo "" echo ""
echo "$(gettext " Supported formats: tar, gzip, bzip2, xzip, lzip, 7z, rar (only unzip) and zip")" echo "$(gettext " Supported formats: tar, gzip, bzip2, xzip, lzip, 7z, rar (only unzip) and zip")"
echo "" echo ""
elif [ $1 = "-v" ];then elif [ "$1" = "-v" ];then
printf -- "$(gettext "jkazip by JKA Network; version %s")" "$version" printf -- "$(gettext "jkazip by JKA Network; version %s")" "$version"
echo echo
elif [ $1 = "-d" ];then elif [ "$1" = "-d" ];then
if [ -z $2 ];then if [ -z "$2" ];then
echo "$(gettext "No file or directory specified")" > /dev/stderr echo "$(gettext "No file or directory specified")" > /dev/stderr
exit exit
elif [ -f $2 ];then elif [ -f "$2" ];then
printf -- "$(gettext "File %s will be decompressed")" "$2" printf -- "$(gettext "File %s will be decompressed")" "$2"
echo echo
else else
@@ -74,37 +74,37 @@ elif [ $1 = "-d" ];then
echo echo
exit exit
fi fi
entrada=$2 entrada="$2"
sacaFormato $entrada sacaFormato "$entrada"
case $formato in case $formato in
"tar" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "tgz" | "tbz" | "txz" | "tlz") "tar" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "tgz" | "tbz2" | "txz" | "tlz")
tar xvf $entrada tar xvf "$entrada"
msg2 $entrada msg2 "$entrada"
;; ;;
"7z") "7z")
7z x $entrada 7z x "$entrada"
msg2 $entrada msg2 "$entrada"
;; ;;
"zip") "zip")
unzip $entrada unzip "$entrada"
msg2 $entrada msg2 "$entrada"
;; ;;
"gz" | "lz") "gz" | "lz")
formato="${formato}ip" formato="${formato}ip"
$formato -dk $entrada $formato -dk "$entrada"
msg2 $entrada msg2 "$entrada"
;; ;;
"xz") "xz")
$formato -dk $entrada $formato -dk "$entrada"
msg2 $entrada msg2 "$entrada"
;; ;;
"bz2") "bz2")
bzip2 -dk $entrada bzip2 -dk "$entrada"
msg2 $entrada msg2 "$entrada"
;; ;;
"rar") "rar")
unrar x $entrada unrar x "$entrada"
msg2 $entrada msg2 "$entrada"
;; ;;
*) *)
printf -- "$(gettext "File extension %s are not supported")" $formato > /dev/stderr printf -- "$(gettext "File extension %s are not supported")" $formato > /dev/stderr
@@ -112,54 +112,63 @@ elif [ $1 = "-d" ];then
;; ;;
esac esac
elif [ $1 = "-c" ];then elif [ "$1" = "-c" ];then
salida=$2 salida="$2"
if [ -z $3 ];then if [ -z "$3" ];then
echo "$(gettext "No file or directory specified")" echo "$(gettext "No file or directory specified")"
exit exit
else fi
for i in $@ # TODO: Hacer que esto funcione
do ### Funcion nueva
if [[ $i != $1 && $i != $2 ]];then for compfile in "$@"; do
if [ ! -d $i -a ! -f $i ];then if [[ "$compfile" != "$1" && "$compfile" != "$2" ]];then
printf -- "$(gettext "%s no such file or directory")" "$i" if [ ! -d "$compfile" -a ! -f "$compfile" ];then
echo printf -- "$(gettext "%s no such file or directory")" "$compfile"
exit echo
#exit
fi fi
fi fi
done done
fi ### Fin funcion nueva del tod
files=$3 #Funcion files nueva
for (( i=4; i<=$#; i++)) for compfile in "$@"; do
do if [[ "$compfile" != "$1" && "$compfile" != "$2" ]];then
files="$files $(echo $* | cut -f$i -d" ")" files="$files $compfile"
done fi
sacaFormato $salida done
#Fin funcion files nueva
## files anterior
# files="$3"
# for (( i=4; i<=$#; i++))
# do
# files="$files $(echo $* | cut -f$i -d" ")"
# done
sacaFormato "$salida"
case $formato in case $formato in
"tar" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "tgz" | "tbz" | "txz" | "tlz") "tar" | "tar.xz" | "tar.lz" | "tar.gz" | "tar.bz2" | "tgz" | "tbz2" | "txz" | "tlz")
tar cvfa $salida $files tar cvfa "$salida" $files
msg $files $salida msg "$files" "$salida"
;; ;;
"7z") "7z")
7z a $salida $files 7z a "$salida" $files
msg $files $salida msg "$files" "$salida"
;; ;;
"zip") "zip")
zip $salida $files zip "$salida" $files
msg $files $salida msg "$files" "$salida"
;; ;;
"gz" | "lz") "gz" | "lz")
formato="${formato}ip" formato="${formato}ip"
$formato -9kc $3 > $salida "$formato" -9kc "$3" > "$salida"
msg $3 $salida msg "$3" "$salida"
;; ;;
"xz") "xz")
$formato -9kc $3 > $salida "$formato" -9kc "$3" > "$salida"
msg $3 $salida msg "$3" "$salida"
;; ;;
"bz2") "bz2")
$formato -9kc $3 > $salida "$formato" -9kc "$3" > "$salida"
msg $3 $salida msg "$3" "$salida"
;; ;;
"rar") "rar")
echo "$(gettext "rar compression are not supported")" > /dev/stderr echo "$(gettext "rar compression are not supported")" > /dev/stderr

3
jka-toolkit/pruebas Normal file
View File

@@ -0,0 +1,3 @@
* hotfix
master
pruebas