Fixed a bug that arguments following options were not recognized correctly.

 Changes to be committed:
	modified:   bin/portsreinstall
	modified:   bin/portsreinstall-chroot
	modified:   lib/libmain.sh
	modified:   share/bin/portsreinstall-chroot-mount
	modified:   share/bin/portsreinstall-upgrade

diff --git a/bin/portsreinstall b/bin/portsreinstall
index d676df9..3e2a05b 100755 (executable)
--- a/bin/portsreinstall
+++ b/bin/portsreinstall
@@ -64,6 +64,7 @@ database_maintain_reset_execflag
 # ==================================================
 
 main_parse_options_arguments "$@"
+shift "${OPTIONS_SHIFT}"
 shift "${COMMAND_SHIFT}"
 
 # ========================================================

diff --git a/bin/portsreinstall-chroot b/bin/portsreinstall-chroot
index 72b47d7..ea7e023 100755 (executable)
--- a/bin/portsreinstall-chroot
+++ b/bin/portsreinstall-chroot
@@ -69,6 +69,7 @@ fs_save_current_systembase ''
 # ==================================================
 
 main_parse_options_arguments "$@"
+shift "${OPTIONS_SHIFT}"
 shift "${COMMAND_SHIFT}"
 
 fs_safeguard_basedir "$opt_basedir"

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 0135c40..dc7e55d 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_20180827010420
+       MYVERSION=4.0.0+toward_4.1.0_20180827231737
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }
 

diff --git a/share/bin/portsreinstall-chroot-mount b/share/bin/portsreinstall-chroot-mount
index 91ca276..3f71932 100755 (executable)
--- a/share/bin/portsreinstall-chroot-mount
+++ b/share/bin/portsreinstall-chroot-mount
@@ -70,6 +70,7 @@ fs_save_current_systembase "${SYSTEMBASE}"
 # ==================================================
 
 main_parse_options_arguments "$@"
+shift "${OPTIONS_SHIFT}"
 shift "${COMMAND_SHIFT}"
 opt_invalidate_mount_privilege=no
 

diff --git a/share/bin/portsreinstall-upgrade b/share/bin/portsreinstall-upgrade
index 09d648f..8a3301f 100644 (file)
--- a/share/bin/portsreinstall-upgrade
+++ b/share/bin/portsreinstall-upgrade
@@ -66,6 +66,7 @@ database_maintain_reset_execflag
 # ==================================================
 
 main_parse_options_arguments "$@"
+shift "${OPTIONS_SHIFT}"
 shift "${COMMAND_SHIFT}"
 
 # ========================================================