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

Merge branch 'development'

Browse Source
This commit is contained in:
JoseluCross
2016-09-16 11:45:14 +02:00
parent 1b7aeb97bb 70a4fa7578
commit 9e1b0cfc50
3 changed files with 131 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
jka-toolkit/.gitdit.swp Normal file
View File

Binary file not shown.

11
jka-toolkit/gitdit
View File

@@ -2,11 +2,11 @@
# gitdit, a dialog interface to manage git repositories # gitdit, a dialog interface to manage git repositories
# Author: JKA Network - contacto@jkanetwork.com # Author: JKA Network - contacto@jkanetwork.com
VERSION="1.0.2" VERSION="1.0.3"
#First check if the user is in a git repository #First check if the user is in a git repository
preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ") 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 if [ $preOption = "Not" ];then #When it isn't only it can do git clone
gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 c "Descargar un nuevo repo (Hacer clone)" i "Inicializar nuevo repo"` gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface $VERSION" 0 0 6 c "Descargar un nuevo repo (Hacer clone)" i "Inicializar nuevo repo"`
else #Else, all other options else #Else, all other options
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)" n "Crear nueva rama" b "Cambiar de rama " 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)" n "Crear nueva rama" b "Cambiar de rama " m "Unir ramas (Hacer merge)"`
actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")" #Current branch actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")" #Current branch
@@ -18,12 +18,17 @@ if [ ! -z $gitopt ];then #No canceled
"i") "i")
gitdir=`dialog --stdout --inputbox "Directorio del repositorio" 10 60 "."` gitdir=`dialog --stdout --inputbox "Directorio del repositorio" 10 60 "."`
if [ $(echo $gitdir | cut -f1 -d"/") = "~" ];then #~ don't understand like $HOME if [ $(echo $gitdir | cut -f1 -d"/") = "~" ];then #~ don't understand like $HOME
cant=$(echo $gitdir | grep -o "/" | wc -l)
gitdirdef="$HOME" gitdirdef="$HOME"
for (( i=2; i<=$cant; i++ )) for (( i=2; i<=$cant; i++ ))
do do
gitdirdef="$gitdirdef/$(echo $gitdir | cut -f$i -d"/")" gitdirdef="$gitdirdef/$(echo $gitdir | cut -f$i -d"/")"
done done
elif [ $(echo $gitdit | cut -f1 -d"/") = "." ];then
gitdirdef=$(pwd)
for (( i=1; i<=$cant; i++ ))
do
gitdirdef="$gitdirdef/$(echo $gitdir | cut -f$i -d"/")"
done
fi fi
if [ ! -d $gitdir ];then if [ ! -d $gitdir ];then
mkdir -p $gitdirdef mkdir -p $gitdirdef

6
jka-toolkit/jkazip
View File

@@ -39,7 +39,7 @@ function msg2() {
echo echo
} }
version="2.3.0" version="2.3.1"
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
@@ -122,7 +122,7 @@ elif [ "$1" = "-c" ];then
### Funcion nueva ### Funcion nueva
for compfile in "$@"; do for compfile in "$@"; do
if [[ "$compfile" != "$1" && "$compfile" != "$2" ]];then if [[ "$compfile" != "$1" && "$compfile" != "$2" ]];then
if [ ! -d "$compfile" -a ! -f "$compfile" ];then if [[ ! -d "$compfile" && ! -f "$compfile" ]];then
printf -- "$(gettext "%s no such file or directory")" "$compfile" printf -- "$(gettext "%s no such file or directory")" "$compfile"
echo echo
#exit #exit
@@ -154,7 +154,7 @@ elif [ "$1" = "-c" ];then
msg "$files" "$salida" msg "$files" "$salida"
;; ;;
"zip") "zip")
zip "$salida" $files zip -r "$salida" $files
msg "$files" "$salida" msg "$files" "$salida"
;; ;;
"gz" | "lz") "gz" | "lz")