mirror of
https://gitlab.com/JKANetwork/jka-toolkit.git
synced 2026-02-19 03:21:32 +01:00
Error correction ("), improve error control (~ to $HOME)
This commit is contained in:
@@ -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="0.2.3"
|
VERSION="0.3.0"
|
||||||
#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" 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 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)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" 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
|
||||||
@@ -15,7 +15,24 @@ 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")
|
||||||
git init
|
gitdir=`dialog --stdout --inputbox "Directorio del repositorio" 10 60 "."`
|
||||||
|
if [ $(echo $gitdir | cut -f1 -d"/") = "~" ];then #~ don't understand like $HOME
|
||||||
|
cant=$(echo $gitdir | grep -o "/" | wc -l)
|
||||||
|
gitdirdef="$HOME"
|
||||||
|
for (( i=2; i<=$cant; i++ ))
|
||||||
|
do
|
||||||
|
gitdirdef="$gitdirdef/$(echo $gitdir | cut -f$i -d"/")"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
if [ ! -d $gitdir ];then
|
||||||
|
mkdir -p $gitdirdef
|
||||||
|
fi
|
||||||
|
if [ $? -eq 1 ];then
|
||||||
|
echo "No tienes permiso para escribir en ese directorio" >> /dev/stderr
|
||||||
|
else
|
||||||
|
cd $gitdirdef
|
||||||
|
git init
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
"c")
|
"c")
|
||||||
giturl=`dialog --stdout --inputbox "URL del git" 10 60`
|
giturl=`dialog --stdout --inputbox "URL del git" 10 60`
|
||||||
@@ -29,7 +46,7 @@ if [ ! -z $gitopt ];then #No canceled
|
|||||||
"p")
|
"p")
|
||||||
git pull $actual;;
|
git pull $actual;;
|
||||||
"s")
|
"s")
|
||||||
estado=$(git status | grep "^Changes" ) #It need to commit something?
|
estado=$(git status | grep -o "^Changes" ) #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
|
||||||
|
|||||||
Reference in New Issue
Block a user