[BUG FIX] The transferring mechanism of option values to restarted run was broken.

[portsreinstall/current.git] / portsreinstall

diff --git a/portsreinstall b/portsreinstall
index 1495b4a..0228e3a 100755 (executable)
--- a/portsreinstall
+++ b/portsreinstall
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.0.0+toward_2.0.1_20121118153031
+MYVERSION=2.0.0+toward_2.0.1_20121118154840
 
 PREFIX=${PREFIX:-/usr/local}
 CONFFILE=${PREFIX}/etc/${APPNAME}.conf
@@ -1383,20 +1383,20 @@ terminate_process ()
 if [ ! -e "${DBDIR}/COMPLETE_SAVE_OPTIONS" ]
 then
        [ ! -e "${DBDIR}"/saved_options.sh ] || echo "(Previous option settings for '-s', '-q' and '-d' are reset.)"
-       cat > ${DBDIR}/saved_options.sh << eof
-target_dependent_ports=$target_dependent_ports
-target_required_ports=$target_required_ports
-target_dependent_ports_form2=$target_dependent_ports_form2
-target_required_ports_form2=$target_required_ports_form2
-taboo_ports=$taboo_ports
-taboo_ports_form2=$taboo_ports_form2
-load_pkgtoolsconf=$load_pkgtoolsconf
-avoid_vulner=$avoid_vulner
-skip_unchanged=$skip_unchanged
-keep_distfiles=$keep_distfiles
-renew_options=$renew_options
-supress_self_upadte=$supress_self_upadte
-supress_obsolete_db_clean=$supress_obsolete_db_clean
+       set | grep -e '^target_dependent_ports=' \
+               -e '^target_required_ports=' \
+               -e '^target_dependent_ports_form2=' \
+               -e '^target_required_ports_form2=' \
+               -e '^taboo_ports=' \
+               -e '^taboo_ports_form2=' \
+               -e '^load_pkgtoolsconf=' \
+               -e '^avoid_vulner=' \
+               -e '^skip_unchanged=' \
+               -e '^keep_distfiles=' \
+               -e '^renew_options=' \
+               -e '^supress_self_upadte=' \
+               -e '^supress_obsolete_db_clean=' \
+               > ${DBDIR}/saved_options.sh << eof
 eof
        touch "${DBDIR}/COMPLETE_SAVE_OPTIONS"
 else