Merge branch 'hotfix'

README.md

@@ -5,11 +5,11 @@ GENERAL USAGE NOTES
 --------------------
 * JKA Toolkit is a set of script to make easiest of Linux terminal
 * Now this kit include:
-	* apw - a package wrapper - Version 1.8
+	* apw - a package wrapper - Version 1.9
 		* A wrapper to manage package managers of the differents Linux distributions, compatible with the families of *Debian, Archlinux, RedHat, CentOS, OpenSuse* and *Void Linux*
-	* jkazip - Version 2.0.2
+	* jkazip - Version 2.0.3
 		* A script which use the differents zip and unzip programs, support *tar, lzip, lzma (xz), zip, 7zip, gzip, bzip2* and *rar* (only for unzip)
-	* gitdit - GIT DIalog inTerface Version 0.1
+	* gitdit - GIT DIalog inTerface Version 0.2.2
 		* A dialog interface to manage git repositories with *pull,  add-commit-push, clone, checkout,* and *merge*
 
 Contact

jka-toolkit/gitdit

@@ -1,18 +1,44 @@
 #!/bin/bash
-VERSION="0.2.0"
+# gitdit, a dialog interface to manage git repositories 
-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)"`
+# Author: JKA Network - contacto@jkanetwork.com
-actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
+
+VERSION="0.2.3"
+#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
+	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
+	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
+fi
+if [ ! -z $gitopt ];then #No canceled
 	case $gitopt in
-	"p")	git pull $actual;;
+		#Not staying in a git repo
-	"s")	commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
+		"i")
+			git init
+			;;
+		"c")
+			giturl=`dialog --stdout --inputbox  "URL del git" 10 60`
+			if [ -z $giturl ];then
+				echo "Ningún repositorio especificado"
+				exit
+			fi
+			git clone $giturl
+			;;
+		#Staying in a git repo
+		"p")	
+			git pull $actual;;
+		"s")	
+			estado=$(git status | grep "^Changes" ) #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"
 				fi
 				git add . && git commit -m "$commit" && git push $actual
-		;;
+			else #Nothing to commit, only push
-	"c")
+				git push $actual
-		giturl=`dialog --stdout --inputbox  "URL del git" 10 60`
+			fi
-		git clone $giturl
 			;;
 		"t")
 			commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
@@ -24,11 +50,12 @@ case $gitopt in
 		"b")
 			j=0
 			rama=""
+			#Loop to create dialog whith all branches (except the current)
 			for i in $(git branch --list | grep "^*" -v )
 			do
 				if [ $i != "*" ];then
 					rama="$rama $j $i"
-				lista[$j]=$i
+					lista[$j]=$i #Array with the names of branches
 					let j++
 				fi		
 			done
@@ -61,3 +88,4 @@ case $gitopt in
 			fi		
 			;;
 	esac
+fi