Make pacman chomp

tehdely · 2004-08-26 21:46:13

jsutnoni wrote:

what was i doing wrong? id like to know so it dont happen again.

it could be one of many things.

if you had the patch line in your PKGBUILD, but were manually patching as well (after running makepkg -o), then it would try to patch the same file twice and thus detect a possibly reversed/duplicate patch, etc.

jbNet · 2004-08-27 02:03:45

grabbed the patch from the mirror, and works great... I bet it was some sort of copy/paste whitespace thing.

Thanks, this is very neat

(include it!!!)

sarah31 · 2004-08-27 05:59:05

jsutnoni wrote:

what was i doing wrong? id like to know so it dont happen again.

possibly you rpatch had some white spaces in ther ethat were causing issues.

also I forgot to tell you to add the name of the patch to the source=() array. this has cause hunk failures for me before.

checking for whitespaces or the addition of characters is usually a good idea. you may need to check using a few editors.

kpiche · 2004-08-29 22:08:14

Cutting and pasting to/from the forums usually converts the tabs to spaces. I had this happen to a patch I posted once. I don't think there's much you can do about it except download the file.

BigBadPenguin · 2004-09-13 14:41:55

Great work tehdely!

Noir · 2004-09-19 02:18:53

Now it would be cool if it had color too! HINT HINT

neotuli · 2004-09-19 04:27:50

Noir wrote:

Now it would be cool if it had color too! HINT HINT

DONE! 8)

I'm not sure this is the proper way to do it, but I simply escaped the desired colors. Pacman is now yellow, while I left the dots white.

Enjoy!

diff -Naur orig/pacman-2.8.4/src/pacsync.c pacman-2.8.4/src/pacsync.c
--- orig/pacman-2.8.4/src/pacsync.c     2004-07-16 20:16:35.000000000 -0500
+++ pacman-2.8.4/src/pacsync.c  2004-08-25 03:40:13.000000000 -0500
@@ -57,6 +57,11 @@
 extern PMList *pmc_syncs;
 extern int maxcols;
 
+/* hot hot pacman action */
+struct mouth {
+       unsigned open:1;
+};
+
 int sync_synctree()
 {
        char ldir[PATH_MAX] = "";
@@ -393,6 +398,9 @@
        struct timeval t1;
        float timediff;
 
+       static struct mouth mouth;
+       static unsigned int lastcur = 0;
+
        gettimeofday(&t1, NULL);
        if(xfered+offset == fsz) {
                t = t0;
@@ -424,13 +432,17 @@
        printf(" %s [", sync_fnm);
        cur = (int)((maxcols-64)*pct/100);
        for(i = 0; i < maxcols-64; i++) {
-               (i < cur) ? printf("#") : printf(" ");
+               (i < cur) ? printf("-") : (i == cur) ? ((lastcur == cur) ?
+                       (mouth.open ? printf("33[1;33mC33[0;15m") : printf("33[1;33mc33[0;15m")) :
+                       (++mouth.open ? printf("33[1;33mC33[0;15m") : printf("33[1;33mc33[0;15m"))) :
+                       printf("*");
        }
        if(rate > 1000) {
                printf("] %3d%%  %6dK  %6.0fK/s  %02d:%02d:%02dr", pct, ((xfered+offset) / 1024), rate, eta_h, eta_m, eta_s);
        } else {
                printf("] %3d%%  %6dK  %6.1fK/s  %02d:%02d:%02dr", pct, ((xfered+offset) / 1024), rate, eta_h, eta_m, eta_s);
        }
+       lastcur = cur;
        fflush(stdout);
        return(1);
 }

Also available at: http://neotuli.dyndns.org/arch/colorchomp.diff

PS: Patch works agains 2.9

tehdely · 2004-09-19 05:02:36

I love you neotuli

LavaPunk · 2004-09-20 00:05:26

What can I change in that patch to make my dots white? My console font is red (by choice) and I'd like to keep the rest of my font red, just the dots white and pacman yellow... I'm sure it's possibly....

Noir · 2004-09-20 00:24:28

LavaPunk wrote:

What can I change in that patch to make my dots white? My console font is red (by choice) and I'd like to keep the rest of my font red, just the dots white and pacman yellow... I'm sure it's possibly....

Check this webpage

http://www.linuxgazette.com/issue65/padala.html

I'm too lazy to do it myself, but in that webpage they explain pretty well how the color escape codes work. i.e. yellow is 33

neotuli · 2004-09-20 00:31:23

Errr...as I mentioned in my first patch, it was a quick, more than likely incorrect, job. Turns out I was right. :? Thanks for asking Lavapunk, you got me to fix the whole damn thing in the process .
Consider the first patch I gave obsolete, and use this one.

Changes:
-Correctly returns to previous terminal color
-Doesn't stupidly assume that everyone has a white terminal
-Explicitly specifies white for the dots

diff -Naur orig/pacman-2.8.4/src/pacsync.c pacman-2.8.4/src/pacsync.c
--- orig/pacman-2.8.4/src/pacsync.c     2004-07-16 20:16:35.000000000 -0500
+++ pacman-2.8.4/src/pacsync.c  2004-08-25 03:40:13.000000000 -0500
@@ -57,6 +57,11 @@
 extern PMList *pmc_syncs;
 extern int maxcols;
 
+/* hot hot pacman action */
+struct mouth {
+       unsigned open:1;
+};
+
 int sync_synctree()
 {
        char ldir[PATH_MAX] = "";
@@ -393,6 +398,9 @@
        struct timeval t1;
        float timediff;
 
+       static struct mouth mouth;
+       static unsigned int lastcur = 0;
+
        gettimeofday(&t1, NULL);
        if(xfered+offset == fsz) {
                t = t0;
@@ -424,13 +432,17 @@
        printf(" %s [", sync_fnm);
        cur = (int)((maxcols-64)*pct/100);
        for(i = 0; i < maxcols-64; i++) {
-               (i < cur) ? printf("#") : printf(" ");
+               (i < cur) ? printf("-") : (i == cur) ? ((lastcur == cur) ?
+                       (mouth.open ? printf("33[1;33mC33[m") : printf("33[1;33mc33[m")) :
+                       (++mouth.open ? printf("33[1;33mC33[m") : printf("33[1;33mc33[m"))) :
+                       printf("33[0;37m*33[m");
        }
        if(rate > 1000) {
                printf("] %3d%%  %6dK  %6.0fK/s  %02d:%02d:%02dr", pct, ((xfered+offset) / 1024), rate, eta_h, eta_m, eta_s);
        } else {
                printf("] %3d%%  %6dK  %6.1fK/s  %02d:%02d:%02dr", pct, ((xfered+offset) / 1024), rate, eta_h, eta_m, eta_s);
        }
+       lastcur = cur;
        fflush(stdout);
        return(1);
 }

Still available at http://neotuli.dyndns.org/arch/colorchomp.diff

Enjoy!

EDIT: I'd just like to add a known problem disclaimer-ish thing. If for some reason someone runs pacman on a terminal that does not support these perticular escape sequences (which I would not really expect...but you never know), I would expect the output to be VERY ugly.

LavaPunk · 2004-09-20 01:21:13

Thanks a ton. It's dead sexy!

Egil.B · 2004-09-20 13:57:48

No we'll just have to wait untill Judd includes it. 8)

dp · 2004-09-20 15:01:21

great work neotuli!

did you sent Judd your patch?

Dreameen · 2004-09-20 16:48:46

Hmmmm...this patch doesn't work with the latest pacman. Where can i download the old version of pacman???

Noir · 2004-09-20 20:07:44

Dreameen wrote:

Hmmmm...this patch doesn't work with the latest pacman. Where can i download the old version of pacman???

The patch does work with the latest version of pacman (I installed it yesterday). You only have to modify the upperpart of the .diff file. I mean:

change this

diff -Naur orig/pacman-2.8.4/src/pacsync.c pacman-2.8.4/src/pacsync.c 
--- orig/pacman-2.8.4/src/pacsync.c     2004-07-16 20:16:35.000000000 -0500 
+++ pacman-2.8.4/src/pacsync.c  2004-08-25 03:40:13.000000000 -0500

to this:

diff -Naur orig/pacman-2.9/src/pacsync.c pacman-2.9/src/pacsync.c 
--- orig/pacman-2.9/src/pacsync.c     2004-07-16 20:16:35.000000000 -0500 
+++ pacman-2.9/src/pacsync.c  2004-08-25 03:40:13.000000000 -0500

.

save the file run makepkg -o apply the patch , then makepkg -e, and afterwards pacman --upgrade pacman-2.9.tar.gz

Dreameen · 2004-09-20 22:07:41

It looks like the file is patched and all, but still I can't see the magic after pacman -U [newly created package].

neotuli · 2004-09-20 23:22:52

Noir wrote:

Dreameen wrote:
Hmmmm...this patch doesn't work with the latest pacman. Where can i download the old version of pacman???
The patch does work with the latest version of pacman (I installed it yesterday). You only have to modify the upperpart of the .diff file. I mean:
change this
diff -Naur orig/pacman-2.8.4/src/pacsync.c pacman-2.8.4/src/pacsync.c 
--- orig/pacman-2.8.4/src/pacsync.c     2004-07-16 20:16:35.000000000 -0500 
+++ pacman-2.8.4/src/pacsync.c  2004-08-25 03:40:13.000000000 -0500 
to this:
diff -Naur orig/pacman-2.9/src/pacsync.c pacman-2.9/src/pacsync.c 
--- orig/pacman-2.9/src/pacsync.c     2004-07-16 20:16:35.000000000 -0500 
+++ pacman-2.9/src/pacsync.c  2004-08-25 03:40:13.000000000 -0500 
.
save the file run makepkg -o apply the patch , then makepkg -e, and afterwards pacman --upgrade pacman-2.9.tar.gz

You shouldn't have to do any of this... patch using

cd (pacman source directory)
patch -p1 < (location of colorchomp.diff)

This will cause patch to strip off the first part of the file location, thus eliminating any need to change it manually.

Dreameen: are you using a color console?

DP: Submitting it right now.

Dreameen · 2004-09-21 12:10:38

I've tried patching the sources every possible way and the patch applies fine but it makes no difference for my pacman, maybe it has to do with some language setting or font encoding in my consoles, dunno.

Yes, I'm using a color console. I've tried running pacman in aterm, rxvt, text console, and the only thing i see is a growing arrow(guess my pacman is a true archer

lytez · 2004-09-24 05:22:42

I really think this should be added as a 'secret' command line option, similar to debians `apt-get moo`.

GT · 2004-09-24 05:35:11

Just patched it and it works great with pacman-2.9, aterm, and zsh.

tehdely · 2004-09-26 00:16:44

Updated diff for 2.9.2:

hyar

neotuli · 2004-09-26 02:30:03

Great! Toss it over to Judd as a replacement for the one I sent earlier, maybe 2.9.3 will be chomping

neotuli · 2004-09-26 23:33:16

Dreameen wrote:

I've tried patching the sources every possible way and the patch applies fine but it makes no difference for my pacman, maybe it has to do with some language setting or font encoding in my consoles, dunno.
Yes, I'm using a color console. I've tried running pacman in aterm, rxvt, text console, and the only thing i see is a growing arrow(guess my pacman is a true archer

I just thought of what the problem is, are you using wget? If so, disable it in /etc/pacman.conf.

Dreameen · 2004-10-02 10:05:07

Yep. This is probably the problem. I'll disable wget, patch newest pacman and see if it works. Thanks.

Arch Linux

#26 2004-08-26 21:46:13

Re: Make pacman chomp

#27 2004-08-27 02:03:45

Re: Make pacman chomp

#28 2004-08-27 05:59:05

Re: Make pacman chomp

#29 2004-08-29 22:08:14

Re: Make pacman chomp

#30 2004-09-13 14:41:55

Re: Make pacman chomp

#31 2004-09-19 02:18:53

Re: Make pacman chomp

#32 2004-09-19 04:27:50

Re: Make pacman chomp

#33 2004-09-19 05:02:36

Re: Make pacman chomp

#34 2004-09-20 00:05:26

Re: Make pacman chomp

#35 2004-09-20 00:24:28

Re: Make pacman chomp

#36 2004-09-20 00:31:23

Re: Make pacman chomp

#37 2004-09-20 01:21:13

Re: Make pacman chomp

#38 2004-09-20 13:57:48

Re: Make pacman chomp

#39 2004-09-20 15:01:21

Re: Make pacman chomp

#40 2004-09-20 16:48:46

Re: Make pacman chomp

#41 2004-09-20 20:07:44

Re: Make pacman chomp

#42 2004-09-20 22:07:41

Re: Make pacman chomp

#43 2004-09-20 23:22:52

Re: Make pacman chomp

#44 2004-09-21 12:10:38

Re: Make pacman chomp

#45 2004-09-24 05:22:42

Re: Make pacman chomp

#46 2004-09-24 05:35:11

Re: Make pacman chomp

#47 2004-09-26 00:16:44

Re: Make pacman chomp

#48 2004-09-26 02:30:03

Re: Make pacman chomp

#49 2004-09-26 23:33:16

Re: Make pacman chomp

#50 2004-10-02 10:05:07

Re: Make pacman chomp

Board footer