Merge branch 'beeversion-newvars'

* beeversion-newvars: beeversion: Add new variables *_UNDERSCORE *_DASH beeversion: Add prefix char to print formatted extraname and extraversion
mariux64 · Jun 4, 2012 · 503a339 · 503a339
2 parents 6b02ed3 + ef66e46
commit 503a339
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/bee_version_output.c b/src/bee_version_output.c
@@ -137,6 +137,20 @@ void print_format(char* s, struct beeversion *v, char *filter_pkgfullname)
                         printf(".%s", v->arch);
                     break;
             }
+            if (*p) {
+                switch(*(p+1)) {
+                    case 'x':
+                        if (*(v->subname))
+                            printf("%c%s", *p, v->subname);
+                        p++;
+                        continue;
+                    case 'e':
+                        if (*(v->extraversion))
+                            printf("%c%s", *p, v->extraversion);
+                        p++;
+                        continue;
+                }
+            }
             continue;
         } /* if '%' */
 

diff --git a/src/beeversion.c b/src/beeversion.c
@@ -252,8 +252,12 @@ int main(int argc, char *argv[])
 
     keyvalue = "PKGNAME=%p\n"
                "PKGEXTRANAME=%x\n"
+               "PKGEXTRANAME_UNDERSCORE=%_x\n"
+               "PKGEXTRANAME_DASH=%-x\n"
                "PKGVERSION=( @v )\n"
                "PKGEXTRAVERSION=%e\n"
+               "PKGEXTRAVERSION_UNDERSCORE=%_e\n"
+               "PKGEXTRAVERSION_DASH=%-e\n"
                "PKGREVISION=%r\n"
                "PKGARCH=%a\n"
                "PKGFULLNAME=%P\n"