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

Merge branch 'hotfix' of gitlab.com:JKANetwork/jka-toolkit into hotfix

Browse Source
This commit is contained in:
JoseluCross
2016-06-22 16:52:25 +02:00
parent f86124cf50 55e59679c5
commit 72eb339b9d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jka-toolkit/apw
View File

@@ -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

10
jka-toolkit/gitd → jka-toolkit/gitdit
View File

@@ -1,10 +1,10 @@
#!/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.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
"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
esac