jkanetwork/jka-toolkit
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/jka-toolkit.git synced 2026-02-19 11:31:31 +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.

137
jka-toolkit/gitdit
View File

@@ -2,79 +2,84 @@
# 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
actual2=$(git branch --list | grep "^*" | cut -f2 -d" ") #Current branch name actual2=$(git branch --list | grep "^*" | cut -f2 -d" ") #Current branch name
fi fi
if [ ! -z $gitopt ];then #No canceled if [ ! -z $gitopt ];then #No canceled
case $gitopt in case $gitopt in
#Not staying in a git repo #Not staying in a git repo
"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
fi elif [ $(echo $gitdit | cut -f1 -d"/") = "." ];then
if [ ! -d $gitdir ];then gitdirdef=$(pwd)
for (( i=1; i<=$cant; i++ ))
do
gitdirdef="$gitdirdef/$(echo $gitdir | cut -f$i -d"/")"
done
fi
if [ ! -d $gitdir ];then
mkdir -p $gitdirdef mkdir -p $gitdirdef
fi fi
if [ $? -eq 1 ];then if [ $? -eq 1 ];then
echo "No tienes permiso para escribir en ese directorio" >> /dev/stderr echo "No tienes permiso para escribir en ese directorio" >> /dev/stderr
else else
cd $gitdirdef cd $gitdirdef
git init git init
fi fi
;; ;;
"c") "c")
giturl=`dialog --stdout --inputbox "URL del git" 10 60` giturl=`dialog --stdout --inputbox "URL del git" 10 60`
if [ -z $giturl ];then if [ -z $giturl ];then
echo "Ningún repositorio especificado" echo "Ningún repositorio especificado"
exit exit
fi fi
git clone $giturl git clone $giturl
;; ;;
#Staying in a git repo #Staying in a git repo
"p") "p")
git pull $actual;; git pull $actual;;
"s") "s")
estado=$(git status | grep -E '(^Changes|^Untracked)' ) #It need to commit something? estado=$(git status | grep -E '(^Changes|^Untracked)' ) #It need to commit something?
if [ "$estado" ];then #When is necesary commit if [ "$estado" ];then #When is necesary commit
commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"` 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 $actual git add . && git commit -m "$commit" && git push $actual
else #Nothing to commit, only push else #Nothing to commit, only push
git push $actual git push $actual
fi fi
;; ;;
"t") "t")
commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50 "changes"` 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 add . && git commit -m "$commit"
;; ;;
"b") "b")
howopt=`dialog --stdout --scrollbar --menu "Cambiar de rama" 0 0 6 c "Solo cambiar de rama" u "Cambiar de rama y actualizarla"` howopt=`dialog --stdout --scrollbar --menu "Cambiar de rama" 0 0 6 c "Solo cambiar de rama" u "Cambiar de rama y actualizarla"`
if [ -z $howopt ];then if [ -z $howopt ];then
exit exit
fi fi
j=0 j=0
rama="" rama=""
#Loop to create dialog whith all branches (except the current) #Loop to create dialog whith all branches (except the current)
for i in $(git branch -a | grep -v "^*" | grep -v "HEAD \->") for i in $(git branch -a | grep -v "^*" | grep -v "HEAD \->")
do do
aux2=0 aux2=0
if [ -z $(echo $i | grep -o "remotes") ];then if [ -z $(echo $i | grep -o "remotes") ];then
aux=$i aux=$i
@@ -97,37 +102,37 @@ if [ ! -z $gitopt ];then #No canceled
lista[$j]=$aux #Array with the names of branches lista[$j]=$aux #Array with the names of branches
let j++ let j++
fi fi
done done
ramificacion=`dialog --stdout --scrollbar --menu "Selecione la rama a saltar" 0 0 6 $rama` ramificacion=`dialog --stdout --scrollbar --menu "Selecione la rama a saltar" 0 0 6 $rama`
if [ ! -z $ramificacion ];then if [ ! -z $ramificacion ];then
git checkout ${lista[$ramificacion]} git checkout ${lista[$ramificacion]}
if [ $howopt = "u" ];then if [ $howopt = "u" ];then
git pull origin ${lista[$ramificacion]} git pull origin ${lista[$ramificacion]}
fi fi
fi fi
;; ;;
"n") "n")
NewBranch=`dialog --stdout --inputbox "Nombre de la nueva rama" 10 50 "new branch"` NewBranch=`dialog --stdout --inputbox "Nombre de la nueva rama" 10 50 "new branch"`
if [ ! -z $NewBranch ];then if [ ! -z $NewBranch ];then
git checkout -b $NewBranch git checkout -b $NewBranch
fi fi
;; ;;
"m") "m")
j=0 j=0
rama="" rama=""
for i in $(git branch --list | grep "^*" -v ) for i in $(git branch --list | grep "^*" -v )
do do
if [ $i != "*" ];then if [ $i != "*" ];then
rama="$rama $j $i" rama="$rama $j $i"
lista[$j]=$i lista[$j]=$i
let j++ let j++
fi fi
done done
merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir a $(git branch --list | grep "^*" | cut -f2 -d" ")" 0 0 6 $rama` merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir a $(git branch --list | grep "^*" | cut -f2 -d" ")" 0 0 6 $rama`
if [ ! -z $merges ];then if [ ! -z $merges ];then
git merge ${lista[$merges]} git merge ${lista[$merges]}
git push $actual git push $actual
fi fi
;; ;;
esac esac
fi fi

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")