changeset 107:f8642efe05a1

Renamed (environment/configuration) variables to have a FPKG_ prefix. Otherwise they seemed too generic.
author Franz Glasner <fzglas.hg@dom66.de>
date Wed, 02 Oct 2019 09:41:46 +0200
parents aa353a3e13e5
children ef1551e7cb16
files bin/fpkg
diffstat 1 files changed, 30 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/bin/fpkg	Tue Oct 01 09:45:11 2019 +0200
+++ b/bin/fpkg	Wed Oct 02 09:41:46 2019 +0200
@@ -45,34 +45,34 @@
 
 ENVIRONMENT:
 
-  AUDIT_FLAGS
+  FPKG_AUDIT_FLAGS
                  Additional flags given to `pkg audit`
                  (Default: -Fr)
 
-  UPDATE_FLAGS
+  FPKG_UPDATE_FLAGS
                  Additional flags given to `pkg update`
                  (Default: empty)
 
-  UPGRADE_FLAGS
+  FPKG_UPGRADE_FLAGS
                  Additional flags given to `pkg upgrade` and `pkg upgrade -n`
                  (Default: empty)
 
-  SIGN
+  FPKG_SIGN
                  Marker for the begin of an output group (local host or jail)
                  (Default: "===> ")
 
-  SKIPSIGN
+  FPKG_SKIPSIGN
                  Marker for the begin of a skipped output group
                  (Default: "----> ")
 
   All other environment variables that affect `pkg` are effective also.
 '
 
-: ${AUDIT_FLAGS:=-Fr}
-: ${UPDATE_FLAGS:=}
-: ${UPGRADE_FLAGS:=}
-: ${SIGN:='===> '}
-: ${SKIPSIGN:='----> '}
+: ${FPKG_AUDIT_FLAGS:=-Fr}
+: ${FPKG_UPDATE_FLAGS:=}
+: ${FPKG_UPGRADE_FLAGS:=}
+: ${FPKG_SIGN:='===> '}
+: ${FPKG_SKIPSIGN:='----> '}
 
 
 has_same_userland_version() {
@@ -103,15 +103,15 @@
     : 'Do a local `pkg audit -Fr` and also for all running jails
 
     '
-    echo "${SIGN}LOCALHOST"
-    pkg audit ${AUDIT_FLAGS}
+    echo "${FPKG_SIGN}LOCALHOST"
+    pkg audit ${FPKG_AUDIT_FLAGS}
     for _j in $(jls -N | awk '{if(NR>1)print $1}' | sort); do
         echo ""
-        echo "${SIGN}JAIL: ${_j}"
+        echo "${FPKG_SIGN}JAIL: ${_j}"
         if has_same_userland_version "${_j}"; then
-            pkg -j "${_j}" audit ${AUDIT_FLAGS}
+            pkg -j "${_j}" audit ${FPKG_AUDIT_FLAGS}
         else
-            echo "${SKIPSIGN}SKIPPED because of different userland"
+            echo "${FPKG_SKIPSIGN}SKIPPED because of different userland"
         fi
     done
 }
@@ -121,15 +121,15 @@
     : 'Do a local `pkg update` and also for all running jails
 
     '
-    echo "${SIGN}LOCALHOST"
-    pkg update ${UPDATE_FLAGS}
+    echo "${FPKG_SIGN}LOCALHOST"
+    pkg update ${FPKG_UPDATE_FLAGS}
     for _j in $(jls -N | awk '{if(NR>1)print $1}' | sort); do
         echo ""
-        echo "${SIGN}JAIL: ${_j}"
+        echo "${FPKG_SIGN}JAIL: ${_j}"
         if has_same_userland_version "${_j}"; then
-            pkg -j "${_j}" update ${UPDATE_FLAGS}
+            pkg -j "${_j}" update ${FPKG_UPDATE_FLAGS}
         else
-            echo "${SKIPSIGN}SKIPPED because of different userland"
+            echo "${FPKG_SKIPSIGN}SKIPPED because of different userland"
         fi
     done
 }
@@ -139,15 +139,15 @@
     : 'Do a local `pkg upgrade` and also for all running jails
 
     '
-    echo "${SIGN}LOCALHOST"
-    pkg upgrade ${UPGRADE_FLAGS}
+    echo "${FPKG_SIGN}LOCALHOST"
+    pkg upgrade ${FPKG_UPGRADE_FLAGS}
     for _j in $(jls -N | awk '{if(NR>1)print $1}' | sort); do
         echo ""
-        echo "${SIGN}JAIL: ${_j}"
+        echo "${FPKG_SIGN}JAIL: ${_j}"
         if has_same_userland_version "${_j}"; then
-            pkg -j "${_j}" upgrade ${UPGRADE_FLAGS}
+            pkg -j "${_j}" upgrade ${FPKG_UPGRADE_FLAGS}
         else
-            echo "${SKIPSIGN}SKIPPED because of different userland"
+            echo "${FPKG_SKIPSIGN}SKIPPED because of different userland"
         fi
     done
 }
@@ -157,15 +157,15 @@
     : 'Do a local `pkg upgrade -n` and also for all running jails
 
     '
-    echo "${SIGN}LOCALHOST"
-    pkg upgrade -n ${UPGRADE_FLAGS}
+    echo "${FPKG_SIGN}LOCALHOST"
+    pkg upgrade -n ${FPKG_UPGRADE_FLAGS}
     for _j in $(jls -N | awk '{if(NR>1)print $1}' | sort); do
         echo ""
-        echo "${SIGN}JAIL: ${_j}"
+        echo "${FPKG_SIGN}JAIL: ${_j}"
         if has_same_userland_version "${_j}"; then
-            pkg -j "${_j}" upgrade -n ${UPGRADE_FLAGS}
+            pkg -j "${_j}" upgrade -n ${FPKG_UPGRADE_FLAGS}
         else
-            echo "${SKIPSIGN}SKIPPED because of different userland"
+            echo "${FPKG_SKIPSIGN}SKIPPED because of different userland"
         fi
     done
 }