Merge branch 'for-marius' of https://github.com/ruester/bee

* 'for-marius' of https://github.com/ruester/bee:
  repository: remove beeversion test script
  manpages: update options in bee-remove manpage
  bee-init: remove html anchors from SRCURL
  beelib: call 'logname' if the username is not defined by environment variables
  bee-cache-inventory: avoid printing null pointer

manpages/bee-remove.1.in

@@ -23,13 +23,6 @@ does not match the full name of a bee package, all matching packages will be dis
 .TQ
 .B \-h
 Print a little help screen.
-.TP
-.B \-\-noop
-.TQ
-.B \-n
-Do not actually remove
-.IR <bee-package> ,
-just print.
 
 .SH "ENVIRONMENT"
 .TP

src/bee-cache-inventory.c

@@ -489,7 +489,8 @@ int inventory_dirfile(char *indname, char *outfname, struct inventory_meta meta)
 
         res = inventory_fhfh(infh, outfh, meta);
         if (!res) {
-            fprintf(stderr, "inventarization from %s/%s/CONTENT to %s failed: %m\n", indname, dirname, outfname);
+            fprintf(stderr, "inventarization from %s/%s/CONTENT to %s failed: %m\n",
+                    indname, dirname, outfname ? outfname : "stdout");
             fclose(infh);
             goto closeoutfh;
         }

src/bee-init.sh.in

@@ -184,6 +184,9 @@ function initialize() {
         # and remove all HTTP-GET variables..
         pname=${pname%%\?*}
 
+        # remove anchors
+        pname=${pname%%\#*}
+
         # strip some known and some special suffixes
         pname=${pname%.gz}
         pname=${pname%.bz2}

src/beelib.config.sh.in

@@ -280,6 +280,7 @@ function config_verify_builtin_config() {
     user=${LOGNAME}
     : ${user:=${USER}}
     : ${user:=${USERNAME}}
+    : ${user:=$(logname)}
 
     : ${BEE_TMP_TMPDIR:=/tmp}
     : ${BEE_TMP_BUILDROOT:=${BEE_TMP_TMPDIR}/bee-${user}}