From 525d309f7bb9b46b7005dd85c76f206a9abfc9d3 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Sat, 18 Jun 2016 13:40:38 +0200 Subject: [PATCH 1/9] gitdit --- install.sh | 8 ++++---- jka-toolkit/{gitd => gitdit} | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename jka-toolkit/{gitd => gitdit} (69%) diff --git a/install.sh b/install.sh index 538562c..c24a73f 100755 --- a/install.sh +++ b/install.sh @@ -9,15 +9,15 @@ echo "installer has to run as root / with sudo" exit fi -cp jka-toolkit/{apw,jkazip,gitd} /usr/bin/ +cp jka-toolkit/{apw,jkazip,gitdit} /usr/bin/ chmod +x /usr/bin/apw chmod +x /usr/bin/jkazip -chmod +x /usr/bin/gitd +chmod +x /usr/bin/gitdit #Languages cp jka-toolkit/i18n/apw/es.mo /usr/share/locale/es/LC_MESSAGES/apw.mo cp jka-toolkit/i18n/jkazip/es.mo /usr/share/locale/es/LC_MESSAGES/jkazip.mo #manpages -cp jka-toolkit/manpages/apw.1 /usr/share/man/man1/ -gzip /usr/share/man/man1 +cp -r jka-toolkit/manpages/apw.1 /usr/share/man/man1/ +sudo mandb echo "Finalizado" echo "Finished" diff --git a/jka-toolkit/gitd b/jka-toolkit/gitdit similarity index 69% rename from jka-toolkit/gitd rename to jka-toolkit/gitdit index a521765..001b0e3 100755 --- a/jka-toolkit/gitd +++ b/jka-toolkit/gitdit @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="0.1" -gitopt=`dialog --stdout --scrollbar --menu "gitd, git dialog" 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)"` +VERSION="0.1.1" +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)"` case $gitopt in "p") git pull;; From f292270119de50ae57b841d8476089b2d3e98da9 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Sat, 18 Jun 2016 13:43:40 +0200 Subject: [PATCH 2/9] install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index c24a73f..9245971 100755 --- a/install.sh +++ b/install.sh @@ -17,7 +17,7 @@ chmod +x /usr/bin/gitdit cp jka-toolkit/i18n/apw/es.mo /usr/share/locale/es/LC_MESSAGES/apw.mo cp jka-toolkit/i18n/jkazip/es.mo /usr/share/locale/es/LC_MESSAGES/jkazip.mo #manpages -cp -r jka-toolkit/manpages/apw.1 /usr/share/man/man1/ -sudo mandb +cp manpages/apw.1.gz /usr/share/man/man1/ +sudo mandb -q echo "Finalizado" echo "Finished" From 9d5e42daea4239bef1ac3bb02f5717e44990c9ac Mon Sep 17 00:00:00 2001 From: kprkpr Date: Sat, 18 Jun 2016 18:16:54 +0200 Subject: [PATCH 3/9] 1.9 --- jka-toolkit/apw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/apw b/jka-toolkit/apw index f649afd..d778da4 100755 --- a/jka-toolkit/apw +++ b/jka-toolkit/apw @@ -10,7 +10,7 @@ export TEXTDOMAIN='apw' export TEXTDOMAINDIR='/usr/share/locale' #Version variable -version="1.8.1" +version="1.9" #This option is for make if case insensitive shopt -s nocasematch From 96a485adb6442f5f40f93244506a7543456b086a Mon Sep 17 00:00:00 2001 From: kprkpr Date: Sat, 18 Jun 2016 23:10:00 +0200 Subject: [PATCH 4/9] changes --- jka-toolkit/gitdit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index 001b0e3..63e87eb 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -1,10 +1,10 @@ #!/bin/bash -VERSION="0.1.1" +VERSION="0.1.2" 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)"` case $gitopt in "p") git pull;; - "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 commit="changes" fi @@ -22,10 +22,10 @@ case $gitopt in until [[ $gitbusing && $gitbmerge ]] do gitbusing=`dialog --stdout --inputbox "Rama actual" 10 60` - gitbmerge=`dialog --stdout --inputbox "Rama con la que unir (la final,normalmente master)" 10 60` + gitbmerge=`dialog --stdout --inputbox "Rama con la que unir (la final,normalmente master)" 10 60 "master"` done git checkout $gitbmerge git merge $gitbusing git push ;; -esac \ No newline at end of file +esac From 782b200c606cfe0cbae174a0cd72f1f766b07168 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Sat, 18 Jun 2016 21:18:15 +0000 Subject: [PATCH 5/9] Update gitdit. Prueba del git status --- jka-toolkit/gitdit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index 63e87eb..c233dec 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="0.1.2" +VERSION="0.1.3" 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)"` case $gitopt in From a8fff3bfd6a4ede92cf95d9ed8f4ad647cbd0153 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Sat, 18 Jun 2016 21:21:32 +0000 Subject: [PATCH 6/9] Prueba del git status 2/2 --- jka-toolkit/gitdit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index c233dec..63e87eb 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="0.1.3" +VERSION="0.1.2" 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)"` case $gitopt in From 843caa34552e0bab0dc661ef6e1d1ed9d14788f7 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Sat, 18 Jun 2016 21:25:44 +0000 Subject: [PATCH 7/9] Pruebas del git staus 3/3 --- jka-toolkit/gitdit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index 63e87eb..c233dec 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="0.1.2" +VERSION="0.1.3" 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)"` case $gitopt in From 27a00c0a9ed9ca7ca42f56679832568d0b822a51 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Sat, 18 Jun 2016 21:31:48 +0000 Subject: [PATCH 8/9] 4/4 --- jka-toolkit/gitdit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index c233dec..63e87eb 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="0.1.3" +VERSION="0.1.2" 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)"` case $gitopt in From 55e59679c57a212dc5ca22261151cc091de0606a Mon Sep 17 00:00:00 2001 From: kprkpr Date: Sat, 18 Jun 2016 23:50:39 +0200 Subject: [PATCH 9/9] changes --- jka-toolkit/gitdit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index 63e87eb..c233dec 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -1,5 +1,5 @@ #!/bin/bash -VERSION="0.1.2" +VERSION="0.1.3" 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)"` case $gitopt in