- statusrc contains auxiliary configuration information

* usr/bin/byobu-status, usr/bin/byobu-statusd, usr/lib/byobu/logo:
  - re-source constants in case of upgrades

debian/changelog

@@ -107,10 +107,12 @@ byobu (4.18) unreleased; urgency=low
     - LP: #803509
     - rework usage of status and statusrc
     - status now contains the enable/disable bits for each status item
-    - statusrc contains auxilliary configuration information
+    - statusrc contains auxiliary configuration information
     - remove this stuff from /etc/byobu/statusrc altogether, and move
       it to /usr/share
     - standardize the seeding of the local user's configuration
+  * usr/bin/byobu-status, usr/bin/byobu-statusd, usr/lib/byobu/logo:
+    - re-source constants in case of upgrades
 
   [ James Spencer ]
   * usr/lib/byobu/.constants:

usr/bin/byobu-status

@@ -46,7 +46,7 @@ color() {
 # Source configurations
 for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color"; do
 	[ -r "$i" ] && . "$i"
-do
+done
 
 export P="$1"
 case "$P" in

usr/bin/byobu-statusd

@@ -40,8 +40,8 @@ while true; do
 	fi
 	now=$(date +%s)
 	# Re-source configuration, if changed since last run
-	for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color"; do
-		[ -r "$i" ] && [ "$i" -nt "$BYOBU_RUN_DIR/status" ] && . "$i"
+	for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color" "${BYOBU_PREFIX}/lib/$PKG/."*; do
+		[ "$i" -nt "$BYOBU_RUN_DIR/status" ] && . "$i"
 	done
 	for i in "$BYOBU_PREFIX/lib/$PKG/"*; do
 		case "$i" in

usr/lib/byobu/logo

@@ -33,7 +33,7 @@ get_distro() {
 		_RET=`lsb_release -s -a 2>/dev/null`
 	else
 		# No idea!
-		printf "[B]"
+		_RET="[B]"
 	fi
 }