-S option is changed to supress terminating messages as well.

 Changes to be committed:
	modified:   lib/chroot-mount/libusage.sh
	modified:   lib/chroot/libusage.sh
	modified:   lib/libmain.sh
	modified:   lib/main/libusage.sh
	modified:   lib/upgrade/libusage.sh
	modified:   man/portsreinstall-chroot-mount.8
	modified:   man/portsreinstall-chroot.8
	modified:   man/portsreinstall-upgrade.8
	modified:   man/portsreinstall.8

diff --git a/lib/chroot-mount/libusage.sh b/lib/chroot-mount/libusage.sh
index d4b3c0e..e60d80c 100644 (file)
--- a/lib/chroot-mount/libusage.sh
+++ b/lib/chroot-mount/libusage.sh
@@ -20,7 +20,7 @@ USAGE: ${APPNAME} [OPTIONS] [--] [command]
  -V : Show the current version.
  <Group 2: Effective anytime>
  -a : Suppress messages to be batch-friendly.
- -S : Suppress the credit and opening messages.
+ -S : Suppress the credit, opening and terminating messages.
 
 [ARGUMENTS]
  command:

diff --git a/lib/chroot/libusage.sh b/lib/chroot/libusage.sh
index 459bacf..f00bb5a 100644 (file)
--- a/lib/chroot/libusage.sh
+++ b/lib/chroot/libusage.sh
@@ -21,7 +21,7 @@ USAGE: portsreinstall-chroot [OPTIONS] [--] [command]
  <Group 2: Effective anytime>
  -a : Suppress messages to be batch-friendly.
  -E delimiter(s) : Custom delimiter character(s) for -e option.
- -S : Suppress the credit and opening messages.
+ -S : Suppress the credit, opening and terminating messages.
  <Group 3: Saved and not renewable until cleaning>
  -b : Base directory of the chroot environment (default: /home/.portsreinstall-chroot).
  -c : Suppress cleaning the temporary database even if its obsolete.

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 4d9b8f8..272a598 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180822002826
+       MYVERSION=4.0.0+toward_4.1.0_20180822003807
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 
@@ -97,10 +97,12 @@ main_define_common_termination_messages ()
                then
                        message_echo "INFO: Terminated at `message_timestamp`$msg_where."
                        message_echo
+                       [ $opt_no_opening_message = yes ] && return
                        message_echo " You can restart this process from the terminated point by"
                else
                        message_echo "INFO: Aborted at `message_timestamp`$msg_where."
                        message_echo
+                       [ $opt_no_opening_message = yes ] && return
                        message_echo " You may restart this process from the aborted point by"
                fi
                message_echo "executing without options or arguments as:"

diff --git a/lib/main/libusage.sh b/lib/main/libusage.sh
index 9a3141b..ddf660d 100644 (file)
--- a/lib/main/libusage.sh
+++ b/lib/main/libusage.sh
@@ -21,7 +21,7 @@ USAGE: portsreinstall [OPTIONS] [--] [command]
  -a : Suppress messages to be batch-friendly.
  -i : Include new targets to the "needed" list.
  -M : Reset group 4 option settings.
- -S : Suppress the credit and opening messages.
+ -S : Suppress the credit, opening and terminating messages.
  <Group 3: Effective only with redo command>
  -L : Reload configuration files and reset group 6 option settings.
  -N : Reset group 5 option settings.

diff --git a/lib/upgrade/libusage.sh b/lib/upgrade/libusage.sh
index d6cf30d..13bc6cb 100644 (file)
--- a/lib/upgrade/libusage.sh
+++ b/lib/upgrade/libusage.sh
@@ -21,7 +21,7 @@ USAGE: ${APPNAME} [OPTIONS] [--] [command]
  <Group 2: Effective anytime>
  -a : Suppress messages to be batch-friendly.
  -M : Reset group 4 option settings.
- -S : Suppress the credit and opening messages.
+ -S : Suppress the credit, opening and terminating messages.
  <Group 3: Saved and transferred to restarted runs, renewable by -M option>
  -c : Suppress cleaning the temporary database even if its obsolete.
  -n : No operation is carried out (just for seeing what will be done).

diff --git a/man/portsreinstall-chroot-mount.8 b/man/portsreinstall-chroot-mount.8
index 272a65f..7e33615 100644 (file)
--- a/man/portsreinstall-chroot-mount.8
+++ b/man/portsreinstall-chroot-mount.8
@@ -72,7 +72,7 @@ Comments are suppressed as much as possible.
 .PD 0
 .TP
 \fB\-\-no\-opening\-message\fR
-Suppress the credit and opening messages.
+Suppress the credit, opening and terminating messages.
 Option \fB\-a\fR takes higher priority over this option.
 .PD
 .SH DETAILS

diff --git a/man/portsreinstall-chroot.8 b/man/portsreinstall-chroot.8
index daf9ab2..044d3f8 100644 (file)
--- a/man/portsreinstall-chroot.8
+++ b/man/portsreinstall-chroot.8
@@ -156,7 +156,7 @@ If a string longer than one-character length is set, the all characters are reco
 .PD 0
 .TP
 \fB\-\-no\-opening\-message\fR
-Suppress the credit and opening messages.
+Suppress the credit, opening and terminating messages.
 Option \fB\-a\fR takes higher priority over this option.
 .PD
 .SS Group 3: Saved and not renewable until cleaning

diff --git a/man/portsreinstall-upgrade.8 b/man/portsreinstall-upgrade.8
index 9ebf581..da347a1 100644 (file)
--- a/man/portsreinstall-upgrade.8
+++ b/man/portsreinstall-upgrade.8
@@ -95,7 +95,7 @@ Check the saved options by \fBportsreinstall options\fR command before specifyin
 .PD 0
 .TP
 \fB\-\-no\-opening\-message\fR
-Suppress the credit and opening messages.
+Suppress the credit, opening and terminating messages.
 Option \fB\-a\fR takes higher priority over this option.
 .PD
 .SS Group 3: Saved and transferred to restarted runs, renewable by \-M option

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 3fd8fe1..214d460 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -420,7 +420,7 @@ Check the saved options by \fBportsreinstall options\fR command before specifyin
 .PD 0
 .TP
 \fB\-\-no\-opening\-message\fR
-Suppress the credit and opening messages.
+Suppress the credit, opening and terminating messages.
 Option \fB\-a\fR takes higher priority over this option.
 .PD
 .SS Group 3: Effective only with redo command