From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sun, 17 Feb 2019 21:40:10 +0000 (+0000)
Subject: etc/profile.d/sys.sh
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=7e17aab221be25679943d82d82dee37b0c7877a0;p=nb.git

etc/profile.d/sys.sh
---

diff --git a/etc/profile.d/sys.sh b/etc/profile.d/sys.sh
index e5837484..30ad9b4c 100644
--- a/etc/profile.d/sys.sh
+++ b/etc/profile.d/sys.sh
@@ -3,6 +3,17 @@
 # NB 10.12.16   #*) return ;;
 # NB 10.12.16 esac
 
+sys_watch() {
+	local opt="$@"
+	[ -z "$opt" ] && opt="-d"
+
+	shopt -s expand_aliases;
+	#export -f $(typeset -f | awk '/^[a-z]+[a-zA-Z0-9_]+ \(\)/{print $1}')
+	watch --no-title $opt ". $NB_ROOT/etc/profile.d/sys.sh && sys_activity"
+# NB 08.08.17   export -f sys_activity
+# NB 08.08.17   watch --no-title $opt bash -c "sys_activity"
+}
+
 sys_infos() {
 	local s="$(printf '\t')"
 	grep -vE "^[^${s}]+${s}$" << EOF
@@ -16,16 +27,6 @@ os${s}$(sys_os)
 EOF
 }
 
-sys_os() {
-	if [ -e /etc/os-release ]; then
-		(
-			. /etc/os-release && echo $ID $VERSION
-		)
-	fi
-	#[ -r /etc/debian_version ] && echo Debian $(cat /etc/debian_version) && return
-	echo $(sw_vers 2>/dev/null | awk -F':\t' '/^(ProductName|ProductVersion)/{print $2}' | head -2) && return
-}
-
 sys_date_install() {
 	(date -r $(ls -1drt /lost+found /etc/ssh/ssh_host_dsa_key.pub /etc/ssh_host_dsa_key.pub|head -1) +'%F %T') 2>/dev/null
 }
@@ -119,14 +120,12 @@ sys_activity() {
 	rm -rf "$tmp"*
 }
 
-sys_watch() {
-	local opt="$@"
-	[ -z "$opt" ] && opt="-d"
-
-	shopt -s expand_aliases;
-	#export -f $(typeset -f | awk '/^[a-z]+[a-zA-Z0-9_]+ \(\)/{print $1}')
-	watch --no-title $opt ". $NB_ROOT/etc/profile.d/sys.sh && sys_activity"
-# NB 08.08.17   export -f sys_activity
-# NB 08.08.17   watch --no-title $opt bash -c "sys_activity"
+sys_os() {
+	if [ -e /etc/os-release ]; then
+		(
+			. /etc/os-release && echo $ID $VERSION
+		)
+	fi
+	#[ -r /etc/debian_version ] && echo Debian $(cat /etc/debian_version) && return
+	echo $(sw_vers 2>/dev/null | awk -F':\t' '/^(ProductName|ProductVersion)/{print $2}' | head -2) && return
 }
-