From 30c321d7024985a4282caa9201c3c71d6ef79b4a Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Thu, 9 Jun 2016 14:51:35 +0200 Subject: [PATCH 01/11] Update --- PKGBUILD/apw | 1 + PKGBUILD/jkazip | 1 + manpages/apw.1 | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 160000 PKGBUILD/apw create mode 160000 PKGBUILD/jkazip diff --git a/PKGBUILD/apw b/PKGBUILD/apw new file mode 160000 index 0000000..dbc3c5f --- /dev/null +++ b/PKGBUILD/apw @@ -0,0 +1 @@ +Subproject commit dbc3c5f4dc7ba1b3525f916ec3e75ca5442a6511 diff --git a/PKGBUILD/jkazip b/PKGBUILD/jkazip new file mode 160000 index 0000000..2c5415f --- /dev/null +++ b/PKGBUILD/jkazip @@ -0,0 +1 @@ +Subproject commit 2c5415f5fc39d8bb1d2616022a47096cfe592b04 diff --git a/manpages/apw.1 b/manpages/apw.1 index 5a6e48f..223bc44 100644 --- a/manpages/apw.1 +++ b/manpages/apw.1 @@ -1,5 +1,5 @@ .TH APW 1 "June 2016" Linux "User Manuals" -.SH NAME +.SH NAME apw \- A package wrapper .SH SYNOPSIS .B apw [option] [packages] From be3aefbe11ba07060ba1a28bcd850933205a20de Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Thu, 9 Jun 2016 15:13:24 +0200 Subject: [PATCH 02/11] Update manpages --- manpages/apw.1 | 4 ---- manpages/apw.1.gz | Bin 564 -> 621 bytes 2 files changed, 4 deletions(-) diff --git a/manpages/apw.1 b/manpages/apw.1 index 6a9baee..7e49957 100644 --- a/manpages/apw.1 +++ b/manpages/apw.1 @@ -1,8 +1,4 @@ -<<<<<<< HEAD -.TH APW 1 "June 2016" Linux "User Manuals" -======= .TH APW 1 "2016-06-09" apw(1.7.x) "User Manuals" ->>>>>>> hotfix .SH NAME apw \- A package wrapper .SH SYNOPSIS diff --git a/manpages/apw.1.gz b/manpages/apw.1.gz index d84b78fd2df25a7ed92f16ff3ce5cf177bb3641c..e262fdb4af0077490dfca69fac3f3df00758b5b5 100644 GIT binary patch literal 621 zcmV-z0+Rh7iwFoKYFSqT17UD?E-?VDQ(bSHFcf|Fuei%zk}6p39yU#yrqP6|Y-Yi%6X?sdw@Fx7_POUAA7AtBErgrza0Qb$msf9tOZwhVKs2Z6 z6@SN{W-!St8n_dx6_uSZp5DSLyo(q?;8y@4G$KEW65(V-)1c`Q>Ce@Alg26I*PaXR zb>pN~4{$%A?L&`SM(HAnH`{o<8lX&C5O7hqm6Jgstuu1h`r3<80Gx(eC@(pZamHc? zRGABlAeBXBrIU{cLKS{p>?-ti26J61`HYb3nn(%@C+QA7%ujUdpb++e7J7f{-WnYv z-awGCtSN*;u$^^SbBOnV#%N>b(CL=M6%?9qdoQ)uCMPfMTpP1kStqLM#WPILY<8dn zinp(V#^56=Csj#PP0njO8(0iWQ2qy^gm`N0^BHM|_2RD$qSHjs$5dd0sz8;Km^%mu z!XPN^pw`Cc4lTt$U8}0=^+S^%2EheeR7m*@7WYQi|7IJB!sWMcwTPB;xQ<{ECecmy z_0>R_vJ?gJd+_L#QV=`pfHUIeCGx$b+n@H$M8Sw!lD|>h%>jAIffu-&18R9CZFlgAC|YK@8I%>*()?>1O>|MeB5~)n1yK4uhbnQ-$wa+c#45BfQ&u zjZy}${d*veM%JRFPBf64u5tSJQLu40fl}+T!XQ6TQ24T*LM3-)kMCK-YPam&75AdLL^NK;{ z$l_7zMwV_6iS!Qh_;H3v)<^srBStOrgWM60R@ODy4wC+yFP3SNM&bqm_+)CYjDE&b zk9N-;ZaPaRt7N%O7V{n&DF=zmswur17s`37HcgnlJPW`ZR8j}YGnt4I4<5{=BPi`i zJLT02LFyvx%S}mP%u;T4TD=i+Q!z*3a8!QZ!NS5c9))y!a_HnHdKMe4Nc{(*74uXkY&-$p`+izu!G z3~jj4aRxrrIKgn7wfqi`Z7;f`%Ep`A=&iC9pM_w!r!utGbv=r+_1$8Hcs|8sHJc{u zwEKOynMbSqsiu`w+Vg`=i~Dae=H!pY9`J>Ez0AG&`uiaDX;W~0ucJR*vvYvA0{{Sl C0vJ93 From c041fc42682d84928e3b98810c3f3be7699abe5b Mon Sep 17 00:00:00 2001 From: kprkpr Date: Mon, 13 Jun 2016 00:05:47 +0200 Subject: [PATCH 03/11] odiwhan --- jka-toolkit/odiwhan | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 jka-toolkit/odiwhan diff --git a/jka-toolkit/odiwhan b/jka-toolkit/odiwhan new file mode 100755 index 0000000..6e19035 --- /dev/null +++ b/jka-toolkit/odiwhan @@ -0,0 +1,21 @@ +#!/bin/bash +gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 0 0 6 1 "Descargar actualizaciones del git (Hacer pull)" 2 "Subir actualizaciones al git (Hacer push)" 3 "Descargar un nuevo git (Hacer clone)" 4 "Cambiar de branch/rama (Hacer checkout)"` + +case $gitopt in + 1) git pull;; + 2) commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50` + if [[ -z $commit ]];then + commit="changes" + fi + git add . && git commit -m "$commit" && git push + ;; + 3) + giturl=`dialog --stdout --inputbox "URL del git" 10 60` + git clone $giturl + ;; + 4) + gitbranch=`dialog --stdout --inputbox "Nueva rama/branch" 10 60` + git checkout $gitbranch + ;; + +esac \ No newline at end of file From 10435fd96d059bee0b9123e1d3db62e02ffb3ce6 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Mon, 13 Jun 2016 00:09:33 +0200 Subject: [PATCH 04/11] odiwhan --- jka-toolkit/odiwhan | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jka-toolkit/odiwhan b/jka-toolkit/odiwhan index 6e19035..68e6c09 100755 --- a/jka-toolkit/odiwhan +++ b/jka-toolkit/odiwhan @@ -1,19 +1,19 @@ #!/bin/bash -gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 0 0 6 1 "Descargar actualizaciones del git (Hacer pull)" 2 "Subir actualizaciones al git (Hacer push)" 3 "Descargar un nuevo git (Hacer clone)" 4 "Cambiar de branch/rama (Hacer checkout)"` +gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 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)"` case $gitopt in - 1) git pull;; - 2) commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50` + "p") git pull;; + "s") commit=`dialog --stdout --inputbox "Cambios (texto commit)" 10 50` if [[ -z $commit ]];then commit="changes" fi git add . && git commit -m "$commit" && git push ;; - 3) + "c") giturl=`dialog --stdout --inputbox "URL del git" 10 60` git clone $giturl ;; - 4) + "b") gitbranch=`dialog --stdout --inputbox "Nueva rama/branch" 10 60` git checkout $gitbranch ;; From 9e80d8ecd9e6b48590912e65c23bc8bde10b73d4 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Wed, 15 Jun 2016 20:05:58 +0200 Subject: [PATCH 05/11] Support Void Linux --- jka-toolkit/apw | 45 +++++++++++++++++++++++++++++++++-- jka-toolkit/i18n/apw/apw.pot | 44 +++++++++++++++++++++------------- jka-toolkit/i18n/apw/es.mo | Bin 4329 -> 4740 bytes jka-toolkit/i18n/apw/es.po | 42 ++++++++++++++++++++------------ 4 files changed, 98 insertions(+), 33 deletions(-) diff --git a/jka-toolkit/apw b/jka-toolkit/apw index 2747b54..36dba89 100755 --- a/jka-toolkit/apw +++ b/jka-toolkit/apw @@ -1,5 +1,5 @@ #!/bin/bash -# apw, a simple packager wrapper for Arch, Debian, RedHat/Fedora, CentOS 6, Suse, and all his derivates) +# apw, a simple packager wrapper for Arch, Debian, RedHat/Fedora, CentOS 6, Suse, Void, and more) # It simplifies the process of remembering pacman,apt,dnf, etc , all in one called apw # Author: JKA Network - contacto@jkanetwork.com @@ -10,7 +10,7 @@ export TEXTDOMAIN='apw' export TEXTDOMAINDIR='/usr/share/locale' #Version variable -version="1.8" +version="1.9" #This option is for make if case insensitive shopt -s nocasematch @@ -76,6 +76,10 @@ if [[ ! -f /etc/apw.conf ]];then echo "zypper" > /etc/apw.conf break ;; + "Void Linux (XBPS)") + echo "xbps" > /etc/apw.conf + break + ;; esac done fi @@ -114,6 +118,8 @@ case "$1" in pacman -Syu $packages;; yum | dnf | zypper) $SO update;; + xbps) + xbps-install -Su;; esac;; Uf|-Uf) echo $(gettext "Force updating system") @@ -125,6 +131,9 @@ case "$1" in yum | dnf | zypper) echo "$(gettext "Not supported on your distribution. Doing -U instead")" $SO update;; + xbps) + echo "$(gettext "Not supported on your distribution. Doing -U instead")" + xbps-install -Su;; esac;; Uy|-Uy) echo $updating @@ -137,6 +146,9 @@ case "$1" in $SO -y update;; zypper) $SO --non-interactive update;; + xbps) + echo "$(gettext "Not supported on your distribution. Doing -U instead")" + xbps-install -Su;; esac;; I|-I) printf -- "$(gettext "You are going to install %s and dependencies")" "$packages" @@ -148,6 +160,8 @@ case "$1" in pacman -Syu $packages --needed;; yum | dnf | zypper) $SO install $packages;; + xbps) + xbps-install -S $packages;; esac;; Iy|-Iy) printf -- "$(gettext "You are going to install %s and dependencies")" "$packages" @@ -161,6 +175,9 @@ case "$1" in $SO -y install $packages;; zypper) $SO --non-interactive install $packages;; + xbps) + echo "$(gettext "Not supported on your distribution. Doing -I instead")" + xbps-install -S $packages;; esac;; Ir|-Ir) printf -- "$(gettext "You are going to reinstall %s")" "$packages" @@ -172,6 +189,9 @@ case "$1" in pacman -Syu $packages;; yum | dnf | zypper) $SO reinstall $packages;; + xbps) + echo "$(gettext "Not supported on your distribution. Reconfiguring instead")" + xbps-reconfigure -f $packages esac;; Iry|-Iry) printf -- "$(gettext "You are going to reinstall %s")" "$packages" @@ -184,6 +204,9 @@ case "$1" in $SO -y reinstall $packages;; zypper) $SO --non-interactive reinstall $packages;; + xbps) + echo "$(gettext "Not supported on your distribution. Reconfiguring instead")" + xbps-reconfigure -f $packages esac;; R|-R) printf -- "$(gettext "You are going to remove %s")" "$packages" @@ -194,6 +217,8 @@ case "$1" in pacman -R $packages;; yum | dnf | zypper) $SO remove $packages;; + xbps) + xbps-remove $packages;; esac;; Ry|-Ry) printf -- "$(gettext "You are going to remove %s")" "$packages" @@ -206,6 +231,9 @@ case "$1" in $SO -y remove $packages;; zypper) $SO --non-interactive remove $packages;; + xbps) + echo "$(gettext "Not supported on your distribution. Doing -I instead")" + xbps-remove $packages;; esac;; Rd|-Rd) printf -- "$(gettext "Removing %s along with his dependencies that are not more in use")" "$packages" @@ -213,6 +241,8 @@ case "$1" in case "$SO" in pacman) pacman -Rs $packages;; + xbps) + xbps-remove -R $packages;; *) echo "$(gettext "Not supported on your distribution")";; esac;; @@ -222,6 +252,9 @@ case "$1" in case "$SO" in pacman) pacman -Rs $packages --noconfirm;; + xbps) + echo "$(gettext "Not supported on your distribution. Doing -Rd instead")" + xbps-remove -R $packages;; *) echo "$(gettext "Not supported on your distribution")";; esac;; @@ -241,6 +274,8 @@ case "$1" in dnf clean all --enablerepo=\*;; zypper) zypper clean;; + xbps) + xbps-remove -O;; esac;; Cd|-Cd) echo "$(gettext "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY ADVANCED)")" @@ -251,6 +286,8 @@ case "$1" in pacman -Rs $(pacman -Qdtq);; zypper) zypper --clean-deps;; + xbps) + xbps-remove -o;; *) echo "$(gettext "Not supported on your distribution")";; esac;; @@ -262,6 +299,8 @@ case "$1" in pacman -Ss $packages;; apr | yum | dnf | zypper) $SO search $packages;; + xbps) + xbps-query $packages;; esac;; F|-F) printf -- "$(gettext "Installing files: %s")" "$packages" @@ -273,6 +312,8 @@ case "$1" in pacman -U $packages;; yum | dnf | zypper) rpm -Uvh $packages;; + xbps) + echo "$(gettext "Not supported on your distribution")";; esac;; *) echo "$(gettext "Invalid option especified")" diff --git a/jka-toolkit/i18n/apw/apw.pot b/jka-toolkit/i18n/apw/apw.pot index c70df65..ff021f6 100644 --- a/jka-toolkit/i18n/apw/apw.pot +++ b/jka-toolkit/i18n/apw/apw.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-10 23:59+0200\n" +"POT-Creation-Date: 2016-06-15 20:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -82,7 +82,7 @@ msgstr "" msgid "apw - A Packager Wrapper" msgstr "" -#: apw:39 apw:279 +#: apw:39 apw:320 msgid "Use apw -h for help" msgstr "" @@ -104,60 +104,72 @@ msgid "" "delete this file)" msgstr "" -#: apw:89 +#: apw:93 msgid "No package specified, aborting" msgstr "" -#: apw:106 +#: apw:110 msgid "Updating system" msgstr "" -#: apw:119 +#: apw:125 msgid "Force updating system" msgstr "" -#: apw:126 +#: apw:132 apw:135 apw:150 msgid "Not supported on your distribution. Doing -U instead" msgstr "" -#: apw:142 apw:153 +#: apw:154 apw:167 msgid "You are going to install %s and dependencies" msgstr "" -#: apw:166 apw:177 +#: apw:179 apw:235 +msgid "Not supported on your distribution. Doing -I instead" +msgstr "" + +#: apw:183 apw:197 msgid "You are going to reinstall %s" msgstr "" -#: apw:189 apw:199 +#: apw:193 apw:208 +msgid "Not supported on your distribution. Reconfiguring instead" +msgstr "" + +#: apw:212 apw:224 msgid "You are going to remove %s" msgstr "" -#: apw:211 apw:220 +#: apw:239 apw:250 msgid "Removing %s along with his dependencies that are not more in use" msgstr "" -#: apw:217 apw:226 apw:255 +#: apw:247 apw:259 apw:292 apw:316 msgid "Not supported on your distribution" msgstr "" -#: apw:229 +#: apw:256 +msgid "Not supported on your distribution. Doing -Rd instead" +msgstr "" + +#: apw:262 msgid "Cleaning package manager" msgstr "" -#: apw:246 +#: apw:281 msgid "" "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY " "ADVANCED)" msgstr "" -#: apw:258 +#: apw:295 msgid "Searching %s" msgstr "" -#: apw:267 +#: apw:306 msgid "Installing files: %s" msgstr "" -#: apw:278 +#: apw:319 msgid "Invalid option especified" msgstr "" diff --git a/jka-toolkit/i18n/apw/es.mo b/jka-toolkit/i18n/apw/es.mo index 0505dd0c7e4d474efe88adac55e719941a7174ff..1281a0f411f3b14d68ad027cb93bf6ac243314da 100644 GIT binary patch delta 958 zcmZwFKWI}?6vy$?^y#zJgd+zzvzm#gc>v3)v zk)rLRO?H@#U@gXj81FQjzziP5Yq$sR;W>PP)7a;joxw8Z@Dc9CA2_SuH<%^yDxSt$ zxZA8@Z|GcPVhwj;exuo0oX4H`40qrP@`9~m7JuRa%(`X+Sj1zvggU^}_3>96W1QT? zVQ?0=;2rc>-yYD}&crgNa0Q3)JMPE9uJ(yDs145GDGX5yw(v4p`-qc_FKlja>^2@| z{2Y~$Rh+@2tX{zDm}7l=Pe-Xg5;vQ}94b|hQK@}}(MA$x=NV^E|G$a4f+u(g6CP>C z5maWTF^@IW@5|`p2OLFbEBQY`Crw8aA*S&mj^k%!(>AoN{ozs6!g-8p1hvt-s0_YD zzHM(&8~K9DRA*27$}&iz%%SPKL?gOW5)ei2x*XX0X}WivoU1mnYm~_Eh|$w^sYVp+ zH7ZaQofiLJXp`EY3YfAWCZcEbP|C<;lp+0{{fdS>aL`9@%y_<=>sR9d(Y+MJm-1N=Z=e1a8?`nCZdh;l#wox zUSMx2KSUAx@ej6QUzya5GdO{ta0m;S!)Fm`5Erop^Em78*pA)h(icc^{0ll5CR~3% Date: Wed, 15 Jun 2016 20:10:21 +0200 Subject: [PATCH 06/11] Support Void Linux. Change apw version to 1.8.1 and not to 1.9 --- jka-toolkit/apw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/apw b/jka-toolkit/apw index 36dba89..6d77c7d 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.9" +version="1.8.1" #This option is for make if case insensitive shopt -s nocasematch From 173b11dbf99fb768c4aa2b61ca4a224b441e5746 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Wed, 15 Jun 2016 20:16:53 +0200 Subject: [PATCH 07/11] Changes in odiwhan (NAME PLEASE) --- jka-toolkit/odiwhan | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jka-toolkit/odiwhan b/jka-toolkit/odiwhan index 68e6c09..91e5257 100755 --- a/jka-toolkit/odiwhan +++ b/jka-toolkit/odiwhan @@ -1,5 +1,5 @@ #!/bin/bash -gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 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)"` +gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 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;; @@ -17,5 +17,13 @@ case $gitopt in gitbranch=`dialog --stdout --inputbox "Nueva rama/branch" 10 60` git checkout $gitbranch ;; - + "m") + 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` + done + git checkout $gitbmerge + git merge $gitbusing + ;; esac \ No newline at end of file From 52203548eb2fad66f26dd3af514cb61d1ecc90ea Mon Sep 17 00:00:00 2001 From: kprkpr Date: Wed, 15 Jun 2016 23:42:51 +0200 Subject: [PATCH 08/11] changes --- jka-toolkit/apw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/apw b/jka-toolkit/apw index 6d77c7d..965f7b5 100755 --- a/jka-toolkit/apw +++ b/jka-toolkit/apw @@ -52,7 +52,7 @@ if [[ ! -f /etc/apw.conf ]];then echo "$(gettext "It's the first run of the program, we need a thing before continue")" echo "$(gettext "What, or in what is based your Linux?")" echo "$(gettext "(The answer will be recorded in /etc/apw.conf, if you want to reset apw, delete this file)")" - options=("Debian/Ubuntu (apt)" "Fedora/Redhat (dnf)" "CentOS 6 (yum)" "Archlinux (pacman)" "Suse (zypper)") + options=("Debian/Ubuntu (apt)" "Fedora/Redhat (dnf)" "CentOS 6 (yum)" "Archlinux (pacman)" "Suse (zypper)" "Void Linux (XBPS)") select opt in "${options[@]}" do case $opt in From 5ff7441c66204f27a3586dd92b569b1f09e5891a Mon Sep 17 00:00:00 2001 From: kprkpr Date: Thu, 16 Jun 2016 12:54:56 +0200 Subject: [PATCH 09/11] Changed name --- jka-toolkit/{odiwhan => gitd} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename jka-toolkit/{odiwhan => gitd} (69%) diff --git a/jka-toolkit/odiwhan b/jka-toolkit/gitd similarity index 69% rename from jka-toolkit/odiwhan rename to jka-toolkit/gitd index 91e5257..35dac26 100755 --- a/jka-toolkit/odiwhan +++ b/jka-toolkit/gitd @@ -1,5 +1,6 @@ #!/bin/bash -gitopt=`dialog --stdout --nocancel --scrollbar --menu "Odiwhan, git simple" 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" +gitopt=`dialog --stdout --nocancel --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)"` case $gitopt in "p") git pull;; From 3cf0a23168dd7eabbd0fc8d67af4426bfeb5bd0a Mon Sep 17 00:00:00 2001 From: kprkpr Date: Thu, 16 Jun 2016 12:55:19 +0200 Subject: [PATCH 10/11] gitd 0.1 --- jka-toolkit/gitd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jka-toolkit/gitd b/jka-toolkit/gitd index 35dac26..9af3c5d 100755 --- a/jka-toolkit/gitd +++ b/jka-toolkit/gitd @@ -1,6 +1,6 @@ #!/bin/bash VERSION="0.1" -gitopt=`dialog --stdout --nocancel --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)"` +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)"` case $gitopt in "p") git pull;; From a60f04a67c04a97cc82b15b5d2ed27b51c64046e Mon Sep 17 00:00:00 2001 From: kprkpr Date: Thu, 16 Jun 2016 12:57:58 +0200 Subject: [PATCH 11/11] install.sh --- install.sh | 3 ++- jka-toolkit/gitd | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index da8b3cf..044ac75 100755 --- a/install.sh +++ b/install.sh @@ -9,9 +9,10 @@ echo "installer has to run as root / with sudo" exit fi -cp jka-toolkit/{apw,jkazip} /usr/bin/ +cp jka-toolkit/{apw,jkazip,gitd} /usr/bin/ chmod +x /usr/bin/apw chmod +x /usr/bin/jkazip +chmod +x /usr/bin/gitd #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 diff --git a/jka-toolkit/gitd b/jka-toolkit/gitd index 9af3c5d..a521765 100755 --- a/jka-toolkit/gitd +++ b/jka-toolkit/gitd @@ -26,5 +26,6 @@ case $gitopt in done git checkout $gitbmerge git merge $gitbusing + git push ;; esac \ No newline at end of file