From 2c0c58dafe5c36d403487a3e906dc0c3981e0203 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Mon, 4 Jul 2016 14:04:24 +0200 Subject: [PATCH 1/5] Fix unzip, again ";" --- jka-toolkit/addit | 0 jka-toolkit/jkazip | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 jka-toolkit/addit diff --git a/jka-toolkit/addit b/jka-toolkit/addit old mode 100644 new mode 100755 diff --git a/jka-toolkit/jkazip b/jka-toolkit/jkazip index 73fcdb3..92b5454 100755 --- a/jka-toolkit/jkazip +++ b/jka-toolkit/jkazip @@ -192,7 +192,8 @@ elif [ "$1" = "-l" ];then 7z l "$2" ;; "zip") - uzip -v "$2" + unzip -v "$2" + ;; "gz" ) gzip -l "$2" ;; From 6dca9be9f7a86061185bfb0b064e5b439262e3e3 Mon Sep 17 00:00:00 2001 From: kprkpr Date: Mon, 4 Jul 2016 14:10:53 +0200 Subject: [PATCH 2/5] Fix bug in uploading changes grep. Now works --- jka-toolkit/gitdit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit index 3613e1f..881991a 100755 --- a/jka-toolkit/gitdit +++ b/jka-toolkit/gitdit @@ -2,7 +2,7 @@ # gitdit, a dialog interface to manage git repositories # Author: JKA Network - contacto@jkanetwork.com -VERSION="1.0.1" +VERSION="1.0.2" #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 @@ -47,7 +47,7 @@ if [ ! -z $gitopt ];then #No canceled "p") git pull $actual;; "s") - estado=$(git status | grep -oE "^Changes|^Untracked" ) #It need to commit something? + estado=$(git status | grep -E '(^Changes|^Untracked)' ) #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 From d059d7d70d92833317774737791bc7a28a48239c Mon Sep 17 00:00:00 2001 From: kprkpr Date: Sat, 16 Jul 2016 17:15:22 +0200 Subject: [PATCH 3/5] sudo auto apw --- jka-toolkit/apw | 5 ++-- jka-toolkit/i18n/apw/apw.pot | 54 +++++++++++++++++++---------------- jka-toolkit/i18n/apw/es.mo | Bin 4740 -> 4722 bytes jka-toolkit/i18n/apw/es.po | 46 ++++++++++++++--------------- 4 files changed, 55 insertions(+), 50 deletions(-) diff --git a/jka-toolkit/apw b/jka-toolkit/apw index d778da4..455ec83 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.9.1" #This option is for make if case insensitive shopt -s nocasematch @@ -44,7 +44,8 @@ esac #Force sudo uid=$(/usr/bin/id -u) if [[ $uid != "0" ]];then -echo "$(gettext "apw has to run as root, please run as root/with sudo")" +echo "$(gettext "apw has to run as root, running using sudo")" +sudo ${0} $@ exit fi diff --git a/jka-toolkit/i18n/apw/apw.pot b/jka-toolkit/i18n/apw/apw.pot index ff021f6..00d2d13 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-15 20:02+0200\n" +"POT-Creation-Date: 2016-07-16 17:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -82,94 +82,98 @@ msgstr "" msgid "apw - A Packager Wrapper" msgstr "" -#: apw:39 apw:320 +#: apw:39 apw:321 msgid "Use apw -h for help" msgstr "" #: apw:47 -msgid "apw has to run as root, please run as root/with sudo" -msgstr "" - -#: apw:52 -msgid "It's the first run of the program, we need a thing before continue" +msgid "apw has to run as root, running using sudo" msgstr "" #: apw:53 -msgid "What, or in what is based your Linux?" +msgid "It's the first run of the program, we need a thing before continue" msgstr "" #: apw:54 +msgid "What, or in what is based your Linux?" +msgstr "" + +#: apw:55 msgid "" "(The answer will be recorded in /etc/apw.conf, if you want to reset apw, " "delete this file)" msgstr "" -#: apw:93 +#: apw:94 msgid "No package specified, aborting" msgstr "" -#: apw:110 +#: apw:111 msgid "Updating system" msgstr "" -#: apw:125 +#: apw:126 msgid "Force updating system" msgstr "" -#: apw:132 apw:135 apw:150 +#: apw:133 apw:136 apw:151 msgid "Not supported on your distribution. Doing -U instead" msgstr "" -#: apw:154 apw:167 +#: apw:155 apw:168 msgid "You are going to install %s and dependencies" msgstr "" -#: apw:179 apw:235 +#: apw:180 apw:236 msgid "Not supported on your distribution. Doing -I instead" msgstr "" -#: apw:183 apw:197 +#: apw:184 apw:198 msgid "You are going to reinstall %s" msgstr "" -#: apw:193 apw:208 +#: apw:194 apw:209 msgid "Not supported on your distribution. Reconfiguring instead" msgstr "" -#: apw:212 apw:224 +#: apw:213 +msgid "You are going to remove %s\\n" +msgstr "" + +#: apw:225 msgid "You are going to remove %s" msgstr "" -#: apw:239 apw:250 +#: apw:240 apw:251 msgid "Removing %s along with his dependencies that are not more in use" msgstr "" -#: apw:247 apw:259 apw:292 apw:316 +#: apw:248 apw:260 apw:293 apw:317 msgid "Not supported on your distribution" msgstr "" -#: apw:256 +#: apw:257 msgid "Not supported on your distribution. Doing -Rd instead" msgstr "" -#: apw:262 +#: apw:263 msgid "Cleaning package manager" msgstr "" -#: apw:281 +#: apw:282 msgid "" "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY " "ADVANCED)" msgstr "" -#: apw:295 +#: apw:296 msgid "Searching %s" msgstr "" -#: apw:306 +#: apw:307 msgid "Installing files: %s" msgstr "" -#: apw:319 +#: apw:320 msgid "Invalid option especified" msgstr "" diff --git a/jka-toolkit/i18n/apw/es.mo b/jka-toolkit/i18n/apw/es.mo index 1281a0f411f3b14d68ad027cb93bf6ac243314da..e069c2b94629103b91ff2504c514617fbaeff92a 100644 GIT binary patch delta 371 zcmXBOJ4*vW6o%n%7r_KgG^PmRg$P+AiU^9VNCM)eGXzqIg^jr&QP_yd)+sc-5DR-D zogi*y;V-bVGYAs>33gifj@!&L=R3ohbLD(z9&%QDQBn|<&MoN!cd3gb(k$L!*7R{7 z-|+|+Mx_#V(ByA8jZRFe;5KHkhXs7W8Jvtuhv=ete;rp_2VCw6=5c6DO5qZk1$MBA zWi%u(Or77mb|HJ1qIE~EK)57)7rSP3`1B}fuHBQy1iW|2?K z;}344+pXJEmecLnYnFm1dtx|t;d@@)J4yRZ&fqJ08A;VnYZbqB>{T12|1|w-Lx0oY BHDmw) delta 389 zcmXBOze_?<7{>AET2NA1+ThTy3uz4vf+aQ>WHc&5Llm@J%t*L( Date: Sat, 16 Jul 2016 17:16:28 +0200 Subject: [PATCH 4/5] readme.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6cb09c2..c99defc 100644 --- a/README.md +++ b/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.9 + * apw - a package wrapper - Version 1.9.1 * 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.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.2.2 + * gitdit - GIT DIalog inTerface Version 1.0.2 * A dialog interface to manage git repositories with *pull, add-commit-push, clone, checkout,* and *merge* Contact From 0e705cfdbf85fccc23db337c91c00728772006c5 Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Thu, 1 Sep 2016 12:39:52 +0200 Subject: [PATCH 5/5] Repair gitdit (TODO prove) --- jka-toolkit/.gitdit.swp | Bin 0 -> 20480 bytes jka-toolkit/gitdit | 17 +++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 jka-toolkit/.gitdit.swp diff --git a/jka-toolkit/.gitdit.swp b/jka-toolkit/.gitdit.swp new file mode 100644 index 0000000000000000000000000000000000000000..6074d3bf85727447acadb42799d88c8e629c0f01 GIT binary patch literal 20480 zcmeI2ZEPGz8OJwGA-#r%rY)!v5T5K^lQZf0t)-x(=fv2~OPe}TLy`|6A#=N9-`aP( zm)*TMc9RfQAe06bidsQG6evOkMIcq;B~p2f8mXZmD)EUA6?{OvN~l1iLI5HD&&=-L z`fMjbid3nZvwpt4-JRK)|I9qk?95Z^-?!r-`cUt^7CyIH)|1OF?ys%hXkB=lWlaT< zY_y#)h$6nadhqkvJsC}0#Y3K#|61OC)`0hc72x+bTh?#DSHaUj zfB|p`<@gJD9()~exxNOz0GmQ>@GN*5Yyqpl4^~*# zm%(Z9C>R6p2RDNo!GGV5a)al)?;z zd*Cei5_k$60i$3wD1cY6VDb}i4txuI7CZ{(Km_)KDp&z7V{zv1;LqSQU5+yP#o|B-VHw_p z=O8pA@DH9)X}k$KK&5&x6SQKglHIoH;HJ1PeRY*{a_Z8V4%+dRvQfFLrOF)5dqys+ z{G+RfT~9QENvc$$*yXHofM}FPqb5QeH>KYudyi~LE~uo2APy)YL6K<0BDAR=fA^_p ziNjn_7q`umpdn+L+OVOZP8O2tPaUk5MEe*Ohr>|J(u^0^2~{OuG-X7=1l2;}qq>n! z#m}tTTp>ZFDdMEIx}r71&q1olBQ%h!X4VEtlN1VkTXjI^s1wRC3{Xv^?9Zp{RHD<8 zg@U>{O<%~KOx0?qJ-mY_s1m3Gq6tgFiQA$v*p;^~!33UME|XX7-{jq2dZeh8*@6t# ztt0&`zO-Qj_4JTVqR;kIamNIz%KCW`%|c)FER~!D%c*b1H#4@sb^3_us_j3u{fd6wXJuY9V z%sp5)D^&yvq%%57_Ms2h`JdazhDYgRl_6co;?5vwQ5=vHN)by+`s+-cyNtldN_z^G zaDSPe|wc~pOys;Z(TJwhHsyc5cp)iN1-ol&PxT-zWS5zU&1LE}m_ zMADJrVE6UB4W{0Jxdin&KEu@6c@YIj_T>?;6ianq~drG*FAqyHMYw2ZVLRyth$@;Qr7fp)lZe_ zene&t786Bvfu&R_TyI%)hqFr(p1=)KD^JD!u=PBmed)+ZgtLjZN+5MB#xtvj>uOElPnU-$Pdg_6th>@LiJDO4yG^NscGcvX@e3fO^t%Bi{*evDE z?3TV-+!KpgZW)YYq52(cfEwP~>8YOBVE<6UVLNPak-G+2L0KYu9NE11f=`@5mQn?IyNXk%sr2ND~|PPW&kT=qG` zuhN9BoPgiSj{8zWsLy0M!oX^?s*2C1kFN5`tpC6!^6sye9O1_}Qr7+|iFp{fo+?_Y z+?sKfk;`iTrq!6+Agk5jBDLZhIz_ij+jl)QW?NZ%FClHdu}*fz%1OdRV|`3*-<2T- zgzv%wPNM^IuAC zNIhzWCjhBUNL;FR`Is8HHo;97N3>T=y)aL<((I~sIzyf3r>~x?-JPw)jf_eyrscw^ zrP3V^jJ9Ebj_y!%QP2OV3@3ymQyE_CCFhoth^Xiaol3{pK! z;fGjR2J`*c;833{kMm?ff-Q)S_x0Ic zxP9EOJ1AN!oq2kGta~T>)TZ#oq|98R_Goy6v5IT^YM$R$6H(pb_y5he;9Vc^`+vHB z{|&t7p9WLF1&6?Xup5klJHRS%32Okaf|tP$!FRwnK@qF~e?Y#!1TTXN;75R;^#U*- zqkvJsC}0#Y3K#{90!9I&fKk9GU=+9}1$ey$Yq1WmD5V>G1+`$x@9GQIvDHcSvftSf zQa>ZT$Cq2=(Wi53kNU*5t(q*hA=lr+a(O z)61ZG*}$Wvz!EInAcm?nJ-vy_^DKG~l_&C@KhCmq*cnR;T6WTmX-QQ(zVx0k?y{LA#6KEI0v< zf)W-G#`|!>*I3o#pMkV5xX7