From 797da7b84eea5b6a15efd0ac3ec42ad15c257d25 Mon Sep 17 00:00:00 2001
From: kprkpr <kevin01010@gmail.com>
Date: Sat, 11 Jun 2016 00:03:46 +0200
Subject: [PATCH 1/9] New options and bugfix

---
 jka-toolkit/apw              |  76 +++++++++++++++++------------------
 jka-toolkit/i18n/apw/apw.pot |  40 +++++++-----------
 jka-toolkit/i18n/apw/es.mo   | Bin 4730 -> 4329 bytes
 jka-toolkit/i18n/apw/es.po   |  38 ++++++------------
 4 files changed, 64 insertions(+), 90 deletions(-)

diff --git a/jka-toolkit/apw b/jka-toolkit/apw
index dc462e2..2747b54 100755
--- a/jka-toolkit/apw
+++ b/jka-toolkit/apw
@@ -10,14 +10,14 @@
 export TEXTDOMAIN='apw'
 export TEXTDOMAINDIR='/usr/share/locale'
 #Version variable
-version="1.7.1"
+version="1.8"
 
 #This option is for make if case insensitive
 shopt -s nocasematch
 
 #Basic info echo
 case "$1" in
-	*h)
+	h|-h)
 		printf -- "$(gettext "apw - A Packager Wrapper, a Idea from JKA Network, version %s")" "$version"
 		echo
 		echo "$(gettext "	Usage: apw <option> [packages]")"
@@ -91,8 +91,7 @@ if [[ -z $packages && ( $1 != *u* && $1 != *c* ) ]];then
 fi
 for (( i=3; i<=$#; i++ ))
 do
-	valtmp=$(echo $* | cut -f$i -d" ")
-	packages="$packages $valtmp"
+	packages="$packages $(echo $* | cut -f$i -d" ")"
 done
 
 #Check if is dnf in RedHat, or apt in Debian, new tools
@@ -106,7 +105,7 @@ fi
 #Command wrapper
 updating="$(gettext "Updating system")"
 case "$1" in
-	*U)
+	U|-U)
 		echo $updating
 		case "$SO" in
 			apt)
@@ -116,7 +115,7 @@ case "$1" in
 			yum | dnf | zypper)
 				$SO update;;
 		esac;;
-	*Uf)
+	Uf|-Uf)
 		echo $(gettext "Force updating system")
 		case "$SO" in
 			apt)
@@ -127,18 +126,19 @@ case "$1" in
 				echo "$(gettext "Not supported on your distribution. Doing -U instead")"
 				$SO update;;
 		esac;;
-	*Uy)
+	Uy|-Uy)
 		echo $updating
 		case "$SO" in
 			apt)
 				apt update && apt -y upgrade;;	
 			pacman)
 				pacman -Syu $packages --noconfirm;;
-			yum | dnf | zypper)
-				echo "$(gettext "Not supported on your distribution. Doing -U instead")"
-				$SO update;;
+			yum | dnf)
+				$SO -y update;;
+			zypper)
+				$SO --non-interactive update;;
 		esac;;
-	*I)
+	I|-I)
 		printf -- "$(gettext "You are going to install %s and dependencies")" "$packages"
 		echo
 		case "$SO" in
@@ -149,7 +149,7 @@ case "$1" in
 			yum | dnf | zypper)
 				$SO install $packages;;
 		esac;;
-	*Iy)
+	Iy|-Iy)
 		printf -- "$(gettext "You are going to install %s and dependencies")" "$packages"
 		echo
 		case "$SO" in
@@ -157,11 +157,12 @@ case "$1" in
 				apt update && apt -y install $packages;;
 			pacman)
 				pacman -Syu $packages --noconfirm --needed;;
-			yum | dnf | zypper)
-				echo "$(gettext "Not supported on your distribution. Doing -I instead")"
-				$SO install $packages;;
+			yum | dnf)
+				$SO -y install $packages;;
+			zypper)
+				$SO --non-interactive install $packages;;
 		esac;;
-	*Ir)
+	Ir|-Ir)
 		printf -- "$(gettext "You are going to reinstall %s")" "$packages"
 		echo
 		case "$SO" in
@@ -172,18 +173,19 @@ case "$1" in
 			yum | dnf | zypper)
 				$SO reinstall $packages;;
 		esac;;
-	*Iry)
+	Iry|-Iry)
 		printf -- "$(gettext "You are going to reinstall %s")" "$packages"
 		case "$SO" in
 			apt)
 				apt update && apt -y install --reinstall $packages;;
 			pacman)
 				pacman -Syu $packages --noconfirm;;
-			yum | dnf | zypper)
-				echo "$(gettext "Not supported on your distribution. Doing -Ir instead")"
-				$SO reinstall $packages;;
+			yum | dnf)
+				$SO -y reinstall $packages;;
+			zypper)
+				$SO --non-interactive reinstall $packages;;
 		esac;;
-	*R)
+	R|-R)
 		printf -- "$(gettext "You are going to remove %s")" "$packages"
 		case "$SO" in
 			apt)
@@ -193,18 +195,19 @@ case "$1" in
 			yum | dnf | zypper)
 				$SO remove $packages;;
 		esac;;
-	*Ry)
+	Ry|-Ry)
 		printf -- "$(gettext "You are going to remove %s")" "$packages"
 		case "$SO" in
 			apt)
 				apt -y remove $packages;;
 			pacman)
 				pacman -R $packages --noconfirm;;
-			yum | dnf | zypper)
-				echo "$(gettext "Not supported on your distribution. Doing -R instead")"
-				$SO remove $packages;;
+			yum | dnf)
+				$SO -y remove $packages;;
+			zypper)
+				$SO --non-interactive remove $packages;;
 		esac;;
-	*Rd)
+	Rd|-Rd)
 		printf -- "$(gettext "Removing %s along with his dependencies that are not more in use")" "$packages"
 		echo
 		case "$SO" in
@@ -213,7 +216,7 @@ case "$1" in
 			*)
 			echo "$(gettext "Not supported on your distribution")";;
 		esac;;
-	*Rdy)
+	Rdy|-Rdy)
 		printf -- "$(gettext "Removing %s along with his dependencies that are not more in use")" "$packages"
 		echo
 		case "$SO" in
@@ -222,7 +225,7 @@ case "$1" in
 			*)
 			echo "$(gettext "Not supported on your distribution")";;
 		esac;;
-	*C)
+	C|-C)
 		echo "$(gettext "Cleaning package manager")"
 		case "$SO" in
 			apt)
@@ -237,19 +240,21 @@ case "$1" in
 			dnf)
 				dnf clean all --enablerepo=\*;;
 			zypper)
-				echo "$(gettext "Not supported on your distribution")";;
+				zypper clean;;
 		esac;;
-	*Cd)
+	Cd|-Cd)
 		echo "$(gettext "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY ADVANCED)")"
 		case "$SO" in
 			apt)
 				apt autoremove --purge;;
 			pacman)
 				pacman -Rs $(pacman -Qdtq);;
+			zypper)
+				zypper --clean-deps;;
 			*)
 				echo "$(gettext "Not supported on your distribution")";;
 		esac;;
-	*S)
+	S|-S)
 		printf -- "$(gettext "Searching %s")"  "$packages"
 		echo
 		case "$SO" in
@@ -258,7 +263,7 @@ case "$1" in
 			apr | yum | dnf | zypper)
 				$SO search $packages;;
 		esac;;
-	*F)
+	F|-F)
 		printf -- "$(gettext "Installing files: %s")" "$packages"
 		echo
 		case "$SO" in
@@ -274,10 +279,3 @@ case "$1" in
 		echo "$(gettext "Use apw -h for help")"
 		exit;;
 esac
-
-if [[ $SO = "pacman" ]];then
-	case "$1" in
-		*Rd)
-			pacman -Rs $packages;;
-	esac
-fi
diff --git a/jka-toolkit/i18n/apw/apw.pot b/jka-toolkit/i18n/apw/apw.pot
index e5c38d1..c70df65 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-08 16:38+0200\n"
+"POT-Creation-Date: 2016-06-10 23:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "apw - A Packager Wrapper"
 msgstr ""
 
-#: apw:39 apw:274
+#: apw:39 apw:279
 msgid "Use apw -h for help"
 msgstr ""
 
@@ -108,15 +108,15 @@ msgstr ""
 msgid "No package specified, aborting"
 msgstr ""
 
-#: apw:107
+#: apw:106
 msgid "Updating system"
 msgstr ""
 
-#: apw:120
+#: apw:119
 msgid "Force updating system"
 msgstr ""
 
-#: apw:127 apw:138
+#: apw:126
 msgid "Not supported on your distribution. Doing -U instead"
 msgstr ""
 
@@ -124,52 +124,40 @@ msgstr ""
 msgid "You are going to install %s and dependencies"
 msgstr ""
 
-#: apw:161
-msgid "Not supported on your distribution. Doing -I instead"
-msgstr ""
-
-#: apw:165 apw:176
+#: apw:166 apw:177
 msgid "You are going to reinstall %s"
 msgstr ""
 
-#: apw:183
-msgid "Not supported on your distribution. Doing -Ir instead"
-msgstr ""
-
-#: apw:187 apw:197
+#: apw:189 apw:199
 msgid "You are going to remove %s"
 msgstr ""
 
-#: apw:204
-msgid "Not supported on your distribution. Doing -R instead"
-msgstr ""
-
-#: apw:208 apw:217
+#: apw:211 apw:220
 msgid "Removing %s along with his dependencies that are not more in use"
 msgstr ""
 
-#: apw:214 apw:223 apw:240 apw:250
+#: apw:217 apw:226 apw:255
 msgid "Not supported on your distribution"
 msgstr ""
 
-#: apw:226
+#: apw:229
 msgid "Cleaning package manager"
 msgstr ""
 
-#: apw:243
+#: apw:246
 msgid ""
 "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY "
 "ADVANCED)"
 msgstr ""
 
-#: apw:253
+#: apw:258
 msgid "Searching %s"
 msgstr ""
 
-#: apw:262
+#: apw:267
 msgid "Installing files: %s"
 msgstr ""
 
-#: apw:273
+#: apw:278
 msgid "Invalid option especified"
 msgstr ""
diff --git a/jka-toolkit/i18n/apw/es.mo b/jka-toolkit/i18n/apw/es.mo
index 2d427a52d98e87618d1d44af9b88e99ec21aa6a2..0505dd0c7e4d474efe88adac55e719941a7174ff 100644
GIT binary patch
delta 787
zcmYk)zfV(97{>9Zv~pWSs1+%oLfaHw8d*S>)-**E22D{2Ax6~1#5iF5F}dBfqaktA
z#eq2J0N2FPfrNpj;^^Sw0)K#})`jnLF@!fc{oH$QPS1PZ_jJqq#qeh?^+rUAah_30
zNK;tt;fLtpEdIp_tR<x}T)`!Lg}1Pcb9f;o-NeUu4kNtp?^wpmC!}k*fTL2VH6HFV
z@exNb=#_3`0ng$~9Ksf|K<}`DUvM0|Si;djn#L;D@dftdCJy3PJcDhV#9vrpe`V5S
z&BPV-$rjOxJi{8c(0{y*&#BHoyw3Y--(dn9c!~FK=#zKw9^N=9-NE<h`QPXYH^}M{
zKEN{jYl{b$a1Y}|PD#tWFQONGLYI06FJf^(%Htfm0uQl?A^Lk83-|}GVxHsIv5DlM
z*XZ?cG4uwXd6>anbdQ4UVW}#}l<MdO^XQ5^LAPKXDacXK!8qaJ|1)lj6ZC%+7)6F7
z$8c+DM=0)vG7MiXTB*|vx543lyY~*-6$ke$4)zuWi4&tEqU!2lI4EQs6d*pa+v&<4
W4_{7YqDJy*Dr%;G1kv~Ghr|Jxqe0#P

delta 945
zcmZwFJ!n%=7{>9ZF*Z##jaH4{^`@o@+Jb`;p;c;Iv4Ki4l=^`PQ9~6<38{6>qKj)O
z_%Vxu(7_B<L2!4exCxeuI5>%*gF4jzb90p<zHst8=iHln-t(UGIr}qLTWXKbiRhy3
zq75}kM{qL657ECy8pIR02XEsJe2C-t3QyzKxHODq9Km_qiNElYpRbj2coUD~1Kcjv
z^p4I2Ccfb|9Br1);5FQWFK{z1B7e{)9KaRqz=4F+i6uOYx6m7S9*w_5=33Yc^XG9r
z-p4fS>k*wzOe|m*zQ%6+io3BR+1PO(I>EDe3@hjb=dnW7KH?DLv2~5a?%{sM&(IZF
z#*5g)>P5VRBdo9YbX@uaDd`HHLYL|Zy0nWJCekLIW88;+e-3>FPjMe6)07zxp(`_t
zqd0+nzJLKPVIEhoc9c$jLt~;6`560|Uq+Hvc4OniJ?Mo`qDy=ko#<V31z#fH)Ejgn
zAJCQhfj+W)yF{TBr}?`?Exb$=AdE~T8&;O)bN9|UYEfNrMgB&Np6`S2h=W|i3+hYf
z#s3#h(h2&QxfUGfAiq(#WK=RNQD-zq;^KmbyW~2kmA04Wa3$D~RR12U#*>BM`qcD|
za_Q=9Z=$=kP+dJt7XOUuy@}?QR3Ru&1=BOZ<jh2=I-5x!Y~%fZrc%Y#GxbdRZPRaJ
C#bn?B

diff --git a/jka-toolkit/i18n/apw/es.po b/jka-toolkit/i18n/apw/es.po
index f9f7fdf..39e55e3 100644
--- a/jka-toolkit/i18n/apw/es.po
+++ b/jka-toolkit/i18n/apw/es.po
@@ -92,7 +92,7 @@ msgstr "\tAñadir y a -U o -I (-Uy -Iy -Iry) para autoconfirmar la operación"
 msgid "apw - A Packager Wrapper"
 msgstr "apw - A Package Wrapper"
 
-#: apw:39 apw:274
+#: apw:39 apw:279
 msgid "Use apw -h for help"
 msgstr "Usa apw -h para ver la ayuda"
 
@@ -122,15 +122,15 @@ msgstr ""
 msgid "No package specified, aborting"
 msgstr "Ningún paquete especificado, cerrando"
 
-#: apw:107
+#: apw:106
 msgid "Updating system"
 msgstr "Actualizando el sistema"
 
-#: apw:120
+#: apw:119
 msgid "Force updating system"
 msgstr "Forzando la actualización del sistema"
 
-#: apw:127 apw:138
+#: apw:126
 msgid "Not supported on your distribution. Doing -U instead"
 msgstr "No soportado en tu distribución. Usando -U en su lugar"
 
@@ -138,39 +138,27 @@ msgstr "No soportado en tu distribución. Usando -U en su lugar"
 msgid "You are going to install %s and dependencies"
 msgstr "Vas a instalar %s y sus dependencias"
 
-#: apw:161
-msgid "Not supported on your distribution. Doing -I instead"
-msgstr "No soportado en tu distribución. Usando -I en su lugar"
-
-#: apw:165 apw:176
+#: apw:166 apw:177
 msgid "You are going to reinstall %s"
 msgstr "Vas a reinstalar %s"
 
-#: apw:183
-msgid "Not supported on your distribution. Doing -Ir instead"
-msgstr "No soportado en tu distribución. Usando -Ir en su lugar"
-
-#: apw:187 apw:197
+#: apw:189 apw:199
 msgid "You are going to remove %s"
 msgstr "Vas a borrar %s"
 
-#: apw:204
-msgid "Not supported on your distribution. Doing -R instead"
-msgstr "No soportado en tu distribución. Usando -R en su lugar"
-
-#: apw:208 apw:217
+#: apw:211 apw:220
 msgid "Removing %s along with his dependencies that are not more in use"
 msgstr "Quitando %s junto con las dependencias que no están más en uso"
 
-#: apw:214 apw:223 apw:240 apw:250
+#: apw:217 apw:226 apw:255
 msgid "Not supported on your distribution"
 msgstr "No soportado en tu distribución"
 
-#: apw:226
+#: apw:229
 msgid "Cleaning package manager"
 msgstr "Limpiando gestor de paquetes"
 
-#: apw:243
+#: apw:246
 msgid ""
 "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY "
 "ADVANCED)"
@@ -178,14 +166,14 @@ msgstr ""
 "Limpiar el sistema de dependencias que no están en uso (CUIDADO, SOLO "
 "EXPERIMENTADOS)"
 
-#: apw:253
+#: apw:258
 msgid "Searching %s"
 msgstr "Buscando %s"
 
-#: apw:262
+#: apw:267
 msgid "Installing files: %s"
 msgstr "Instalando archivos: %s"
 
-#: apw:273
+#: apw:278
 msgid "Invalid option especified"
 msgstr "Opción inválida seleccionada"

From c041fc42682d84928e3b98810c3f3be7699abe5b Mon Sep 17 00:00:00 2001
From: kprkpr <kevin01010@gmail.com>
Date: Mon, 13 Jun 2016 00:05:47 +0200
Subject: [PATCH 2/9] 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 <kevin01010@gmail.com>
Date: Mon, 13 Jun 2016 00:09:33 +0200
Subject: [PATCH 3/9] 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 <kevin01010@gmail.com>
Date: Wed, 15 Jun 2016 20:05:58 +0200
Subject: [PATCH 4/9] 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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#zJ<Z0E`|Gu_~4lM{`t;Hx!+QC9fFoUR+LTF+d2(Oa*T(i{K
zA-E_g2;!n5WDuo-n`;*b6&#d;e+HN8;-KH(OYskQ;J(kjH+k>gd+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+<BPR0R@0*~&Ua<FdNAWfl6a3BicTdeMM
zP5ISe@k+T^YMyk5y9=eihR2&}HyJOK=N5uX)k;{e29?&l``V39`Q^Z04E<VIDb}04
b-cW+~{+$|Y_IU$|KkpWU(n2fi-S7AXkNjz?

delta 795
zcmYk)y-QnB7{~FS8k<C|rrP@2)<k?+f?aC6XbI6m21TtRBEEqj4i;OdZg=V6SSnpa
z5ga<%p^f0^AUL>0{{fdS>aL`9@%y_<=>sR9d(Y+MJm-1N=Z=e1a8?`nCZdh;l#wox
zUSMx2KSUAx@ej6QUzya5GdO{ta0m;S!)Fm`5Erop^Em78*pA)h(i<GZCMnQY9;TSs
z#YT)ikVY|yPjD3<;~KI+TbRXte2#yy4V$9UOYFrAe#9#Lg*AA9by&a-{Ecb$S3E}6
zOuRy$Y#g1)3ija|`j3zB1J${~0p6D@?h^QkUA&*5PhP}nd|N5K!yWYe6}rM%vRc47
zY-fKR^57DlW0=T8X_EJG^nxGgQXgX{rmCd|%%LkVkHZ+CzZWox*Z3M6IDQ6)ksR~|
zy?zq|Z?MNh51yiX6iwWfDveAjgI+L#uE-L)1>cc^{0ll5CR~3%<F+_K|3{LMVmN9U
zZY}Ky#Jy0Q;mbuU^@!m%INWdd-a)&<;GTuS-l8C3Vsu1QU8M{Mg$#oNgeP`8UD^M`
dms9b4w(Namy*XBqpN*YF*S8bZ`OCyc$t^onLx%tW

diff --git a/jka-toolkit/i18n/apw/es.po b/jka-toolkit/i18n/apw/es.po
index 39e55e3..74e256d 100644
--- a/jka-toolkit/i18n/apw/es.po
+++ b/jka-toolkit/i18n/apw/es.po
@@ -92,7 +92,7 @@ msgstr "\tAñadir y a -U o -I (-Uy -Iy -Iry) para autoconfirmar la operación"
 msgid "apw - A Packager Wrapper"
 msgstr "apw - A Package Wrapper"
 
-#: apw:39 apw:279
+#: apw:39 apw:320
 msgid "Use apw -h for help"
 msgstr "Usa apw -h para ver la ayuda"
 
@@ -118,47 +118,59 @@ msgstr ""
 "(La respuesta será guardada en /etc/apw.conf, si quieres resetear apw borra "
 "el fichero)"
 
-#: apw:89
+#: apw:93
 msgid "No package specified, aborting"
 msgstr "Ningún paquete especificado, cerrando"
 
-#: apw:106
+#: apw:110
 msgid "Updating system"
 msgstr "Actualizando el sistema"
 
-#: apw:119
+#: apw:125
 msgid "Force updating system"
 msgstr "Forzando la actualización del sistema"
 
-#: apw:126
+#: apw:132 apw:135 apw:150
 msgid "Not supported on your distribution. Doing -U instead"
 msgstr "No soportado en tu distribución. Usando -U en su lugar"
 
-#: apw:142 apw:153
+#: apw:154 apw:167
 msgid "You are going to install %s and dependencies"
 msgstr "Vas a instalar %s y sus dependencias"
 
-#: apw:166 apw:177
+#: apw:179 apw:235
+msgid "Not supported on your distribution. Doing -I instead"
+msgstr "No soportado en tu distribución. Usando -I en su lugar"
+
+#: apw:183 apw:197
 msgid "You are going to reinstall %s"
 msgstr "Vas a reinstalar %s"
 
-#: apw:189 apw:199
+#: apw:193 apw:208
+msgid "Not supported on your distribution. Reconfiguring instead"
+msgstr "No soportado en tu distribución. Reconfigurando en su lugar"
+
+#: apw:212 apw:224
 msgid "You are going to remove %s"
 msgstr "Vas a borrar %s"
 
-#: apw:211 apw:220
+#: apw:239 apw:250
 msgid "Removing %s along with his dependencies that are not more in use"
 msgstr "Quitando %s junto con las dependencias que no están más en uso"
 
-#: apw:217 apw:226 apw:255
+#: apw:247 apw:259 apw:292 apw:316
 msgid "Not supported on your distribution"
 msgstr "No soportado en tu distribución"
 
-#: apw:229
+#: apw:256
+msgid "Not supported on your distribution. Doing -Rd instead"
+msgstr "No soportado en tu distribución. Usando -Rd en su lugar"
+
+#: apw:262
 msgid "Cleaning package manager"
 msgstr "Limpiando gestor de paquetes"
 
-#: apw:246
+#: apw:281
 msgid ""
 "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY "
 "ADVANCED)"
@@ -166,14 +178,14 @@ msgstr ""
 "Limpiar el sistema de dependencias que no están en uso (CUIDADO, SOLO "
 "EXPERIMENTADOS)"
 
-#: apw:258
+#: apw:295
 msgid "Searching %s"
 msgstr "Buscando %s"
 
-#: apw:267
+#: apw:306
 msgid "Installing files: %s"
 msgstr "Instalando archivos: %s"
 
-#: apw:278
+#: apw:319
 msgid "Invalid option especified"
 msgstr "Opción inválida seleccionada"

From c6ae7677ad816587240524fcb159396013cdda66 Mon Sep 17 00:00:00 2001
From: kprkpr <kevin01010@gmail.com>
Date: Wed, 15 Jun 2016 20:10:21 +0200
Subject: [PATCH 5/9] 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 <kevin01010@gmail.com>
Date: Wed, 15 Jun 2016 20:16:53 +0200
Subject: [PATCH 6/9] 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 <kevin01010@gmail.com>
Date: Wed, 15 Jun 2016 23:42:51 +0200
Subject: [PATCH 7/9] 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 <kevin01010@gmail.com>
Date: Thu, 16 Jun 2016 12:54:56 +0200
Subject: [PATCH 8/9] 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 <kevin01010@gmail.com>
Date: Thu, 16 Jun 2016 12:55:19 +0200
Subject: [PATCH 9/9] 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;;