Browse Source

add message titles

Ralf S. Engelschall 24 years ago
parent
commit
3a68948035
2 changed files with 15 additions and 5 deletions
  1. 2 2
      openpkg/openpkg.spec
  2. 13 3
      openpkg/rpmtool

+ 2 - 2
openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020415
-%define       R_openpkg 20020415
+%define       V_openpkg 20020416
+%define       R_openpkg 20020416
 
 #   the used software versions
 %define       V_rpm     4.0.2

+ 13 - 3
openpkg/rpmtool

@@ -54,7 +54,7 @@ if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
     echo '  group  [-c] [-d] <groupname> <min-gid> [<username> ...]'
     echo '  signal [-v] [-t] [-n] [-c] [-d <delay>] [-p <pid>] [-m <pattern>] <sig> [<sig> ...]'
     echo '  config [-v] [-s] [-a] [-r] [-b <ext>] [-p <tagprefix>] [-t <tagname>] [-i <tagid>] <file>'
-    echo '  msg    [-b]'
+    echo '  msg    [-b] [-t <type>]'
     echo ''
     exit 0
 fi
@@ -153,10 +153,12 @@ case $tool in
         gen_tmpfile=yes
         ;;
     msg )
-        str_usage="[-b]"
+        str_usage="[-b] [-t <type>]"
         arg_spec="0="
         opt_spec="b."
+        opt_spec="b.t:"
         opt_b=no
+        opt_t=info
         ;;
     -* )
         echo "$prog_name:Error: unknown option \`$tool'" 2>&1
@@ -1159,10 +1161,18 @@ EOT
         if [ ".$opt_b" = .yes ]; then
             echo . | awk '{ printf("%c", 7); }'
         fi
+        title=""
+        case $opt_t in
+            info   ) title="-------" ;;
+            notice ) title="Notice-" ;;
+            warn   ) title="Warning" ;;
+            error  ) title="Error--" ;;
+            *      ) echo "$msgprefix:Error: invalid message type \`$opt_t'" 1>&2; exit 1 ;;
+        esac
         
         #   display message
         echo . | awk '{ printf("\r"); }'
-        echo "+-----------------------------------------------------------------------------+"
+        echo "+----------------------------------${title}------------------------------------+"
         expand -8 | sed -e 's; *$;;' | awk '{ printf("| %-75s |\n", substr($0, 0, 75)); }'
         echo "+-----------------------------------------------------------------------------+"
         ;;