From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 940BA3858422; Sat, 16 Jul 2022 13:48:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 940BA3858422 To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.920-2-g5c0d6d86 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: df567cdb822e189ac1011024fffa77a70cc736bb X-Git-Newrev: 5c0d6d86ba66957ef8dbb8afa29d7ef90271a876 Message-Id: <20220716134852.940BA3858422@sourceware.org> Date: Sat, 16 Jul 2022 13:48:52 +0000 (GMT) From: Jon TURNEY X-BeenThere: cygwin-apps-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin-apps git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2022 13:48:52 -0000 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=5c0d6d86ba66957ef8dbb8afa29d7ef90271a876 commit 5c0d6d86ba66957ef8dbb8afa29d7ef90271a876 Author: Christian Franke Date: Sat Jul 9 16:57:31 2022 +0200 Log writes to rootdir registry entry https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=1b95ac1a9a8041b04461762a3f48d7cc992076cb commit 1b95ac1a9a8041b04461762a3f48d7cc992076cb Author: Christian Franke Date: Tue Jul 12 18:04:25 2022 +0200 Add new option --no-write-registry If specified, the rootdir is not written to the registry and no registry key is created. Diff: --- install.cc | 6 ++++-- mount.cc | 6 ++++++ po/fr/res.po | 6 +++++- res.pot | 6 +++++- res/en/res.rc | 1 + res/fr/res.rc | 1 + resource.h | 1 + 7 files changed, 23 insertions(+), 4 deletions(-) diff --git a/install.cc b/install.cc index 1fdc699f..fbd28b1c 100644 --- a/install.cc +++ b/install.cc @@ -70,6 +70,7 @@ static long long int total_bytes_sofar = 0; static int package_bytes = 0; static BoolOption NoReplaceOnReboot (false, 'r', "no-replaceonreboot", IDS_HELPTEXT_NO_REPLACEONREBOOT); +static BoolOption NoWriteRegistry (false, '\0', "no-write-registry", IDS_HELPTEXT_NO_WRITE_REGISTRY); struct std_dirs_t { const char *name; @@ -833,8 +834,9 @@ do_install_thread (HINSTANCE h, HWND owner) int df = diskfull (get_root_dir ().c_str()); Progress.SetBar3 (df); - /* Writes Cygwin/setup/rootdir registry value */ - create_install_root (); + if (!NoWriteRegistry) + /* Writes Cygwin/setup/rootdir registry value */ + create_install_root (); std::vector install_q, uninstall_q, sourceinstall_q; diff --git a/mount.cc b/mount.cc index f63edd4c..01363965 100644 --- a/mount.cc +++ b/mount.cc @@ -135,6 +135,12 @@ create_install_root () mbox (NULL, IDS_MOUNT_REGISTRY_KEY_FAILED, MB_OK | MB_ICONWARNING); RegCloseKey (key); + Log (LOG_TIMESTAMP) << "Registry value set: HKEY_" + << (root_scope == IDC_ROOT_USER ? "CURRENT_USER\\" + : "LOCAL_MACHINE\\") + << buf << "\\rootdir = \"" << get_root_dir () << "\"" + << endLog; + // The mount table is already in the right shape at this point. // Reading it again is not necessary. //read_mounts (std::string ()); diff --git a/po/fr/res.po b/po/fr/res.po index 75c133c3..78d57d17 100644 --- a/po/fr/res.po +++ b/po/fr/res.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-29 12:56+0100\n" +"POT-Creation-Date: 2022-07-16 14:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1420,6 +1420,10 @@ msgstr "" msgid "Don't warn about deprecated Windows versions" msgstr "Ne pas avertir pour les vieilles versions de Windows" +#: STRINGTABLE.IDS_HELPTEXT_NO_WRITE_REGISTRY +msgid "Don't write root installation directory to registry" +msgstr "" + #: STRINGTABLE.IDS_HELPTEXT_OLD_KEYS msgid "Enable old cygwin.com keys" msgstr "Utiliser les anciennes clés de cygwin.com" diff --git a/res.pot b/res.pot index ea9ba4e7..2e82da7f 100644 --- a/res.pot +++ b/res.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-29 12:53+0100\n" +"POT-Creation-Date: 2022-07-16 14:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1254,6 +1254,10 @@ msgstr "" msgid "Don't warn about deprecated Windows versions" msgstr "" +#: STRINGTABLE.IDS_HELPTEXT_NO_WRITE_REGISTRY +msgid "Don't write root installation directory to registry" +msgstr "" + #: STRINGTABLE.IDS_HELPTEXT_OLD_KEYS msgid "Enable old cygwin.com keys" msgstr "" diff --git a/res/en/res.rc b/res/en/res.rc index 9683ab52..644b2520 100644 --- a/res/en/res.rc +++ b/res/en/res.rc @@ -679,6 +679,7 @@ BEGIN IDS_HELPTEXT_NO_VERIFY "Don't verify setup.ini signatures" IDS_HELPTEXT_NO_VERSION_CHECK "Suppress checking if a newer version of setup is available" IDS_HELPTEXT_NO_WARN_DEPRECATED_WINDOWS "Don't warn about deprecated Windows versions" + IDS_HELPTEXT_NO_WRITE_REGISTRY "Don't write root installation directory to registry" IDS_HELPTEXT_OLD_KEYS "Enable old cygwin.com keys" IDS_HELPTEXT_ONLY_SITE "Do not download mirror list. Only use sites specified with -s." IDS_HELPTEXT_PACKAGES "Specify packages to install" diff --git a/res/fr/res.rc b/res/fr/res.rc index 79f23711..a0a79090 100644 --- a/res/fr/res.rc +++ b/res/fr/res.rc @@ -665,6 +665,7 @@ BEGIN IDS_HELPTEXT_NO_VERIFY "Ne pas vérifier les signatures de setup.ini" IDS_HELPTEXT_NO_VERSION_CHECK "Ne pas vérifier si une version plus récente de l'assistant est disponible" IDS_HELPTEXT_NO_WARN_DEPRECATED_WINDOWS "Ne pas avertir pour les vieilles versions de Windows" + // IDS_HELPTEXT_NO_WRITE_REGISTRY "XXX: missing translation" IDS_HELPTEXT_OLD_KEYS "Utiliser les anciennes clés de cygwin.com" IDS_HELPTEXT_ONLY_SITE "Ignorer tous les sites sauf ceux spécifiés par -s" IDS_HELPTEXT_PACKAGES "Spécifie les paquets à installer" diff --git a/resource.h b/resource.h index e8ed0fa9..2668dd9e 100644 --- a/resource.h +++ b/resource.h @@ -154,6 +154,7 @@ #define IDS_HELPTEXT_ERROR 1545 #define IDS_HELPTEXT_HEADER 1546 #define IDS_HELPTEXT_FOOTER 1547 +#define IDS_HELPTEXT_NO_WRITE_REGISTRY 1548 // Dialogs