From c50f25ebe67368ba591e3333c4ac556e97ad4783 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Tue, 13 Aug 2024 06:32:49 +0000 Subject: [PATCH] Namecoin: Rebrand namecoin.conf references namecoin.conf's filename was rebranded already, but references to it still used bitcoin.conf. This caused a Guix build fail for Linux targets, and probably also Windows targets. --- contrib/guix/libexec/build.sh | 2 +- doc/bitcoin-conf.md | 20 ++++++++++---------- share/setup.nsi.in | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index fa6933b332..9a3ad6bec3 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -335,7 +335,7 @@ mkdir -p "$DISTSRC" # copy over the example bitcoin.conf file. if contrib/devtools/gen-bitcoin-conf.sh # has not been run before buildling, this file will be a stub - cp "${DISTSRC}/share/examples/bitcoin.conf" "${DISTNAME}/" + cp "${DISTSRC}/share/examples/namecoin.conf" "${DISTNAME}/" cp -r "${DISTSRC}/share/rpcauth" "${DISTNAME}/share/" diff --git a/doc/bitcoin-conf.md b/doc/bitcoin-conf.md index 76711d0e7d..dae9c4c71f 100644 --- a/doc/bitcoin-conf.md +++ b/doc/bitcoin-conf.md @@ -1,10 +1,10 @@ -# `bitcoin.conf` Configuration File +# `namecoin.conf` Configuration File -The configuration file is used by `bitcoind`, `bitcoin-qt` and `bitcoin-cli`. +The configuration file is used by `namecoind`, `namecoin-qt` and `namecoin-cli`. All command-line options (except for `-?`, `-help`, `-version` and `-conf`) may be specified in a configuration file, and all configuration file options (except for `includeconf`) may also be specified on the command line. Command-line options override values set in the configuration file and configuration file options override values set in the GUI. -Changes to the configuration file while `bitcoind` or `bitcoin-qt` is running only take effect after restarting. +Changes to the configuration file while `namecoind` or `namecoin-qt` is running only take effect after restarting. Users should never make any configuration changes which they do not understand. Furthermore, users should always be wary of accepting any configuration changes provided to them by another source (even if they believe that they do understand them). @@ -51,24 +51,24 @@ rpcport=4000 ## Configuration File Path -The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `bitcoin.conf` and it is located in the Bitcoin data directory, but both the Bitcoin data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options. +The configuration file is not automatically created; you can create it using your favorite text editor. By default, the configuration file name is `namecoin.conf` and it is located in the Namecoin data directory, but both the Namecoin data directory and the configuration file path may be changed using the `-datadir` and `-conf` command-line options. -The `includeconf=` option in the `bitcoin.conf` file can be used to include additional configuration files. +The `includeconf=` option in the `namecoin.conf` file can be used to include additional configuration files. ### Default configuration file locations Operating System | Data Directory | Example Path -- | -- | -- -Windows | `%LOCALAPPDATA%\Bitcoin\` | `C:\Users\username\AppData\Local\Bitcoin\bitcoin.conf` -Linux | `$HOME/.bitcoin/` | `/home/username/.bitcoin/bitcoin.conf` -macOS | `$HOME/Library/Application Support/Bitcoin/` | `/Users/username/Library/Application Support/Bitcoin/bitcoin.conf` +Windows | `%LOCALAPPDATA%\Namecoin\` | `C:\Users\username\AppData\Local\Namecoin\namecoin.conf` +Linux | `$HOME/.namecoin/` | `/home/username/.namecoin/namecoin.conf` +macOS | `$HOME/Library/Application Support/Namecoin/` | `/Users/username/Library/Application Support/Namecoin/namecoin.conf` An example configuration file can be generated by [contrib/devtools/gen-bitcoin-conf.sh](../contrib/devtools/gen-bitcoin-conf.sh). Run this script after compiling to generate an up-to-date configuration file. -The output is placed under `share/examples/bitcoin.conf`. +The output is placed under `share/examples/namecoin.conf`. To use the generated configuration file, copy the example file into your data directory and edit it there, like so: ``` # example copy command for linux user -cp share/examples/bitcoin.conf ~/.bitcoin +cp share/examples/namecoin.conf ~/.namecoin ``` diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 575ac875f8..712e1ab655 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -75,7 +75,7 @@ Section -Main SEC0000 File @abs_top_builddir@/release/@BITCOIN_GUI_NAME@@EXEEXT@ File /oname=COPYING.txt @abs_top_srcdir@/COPYING File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt - File @abs_top_srcdir@/share/examples/bitcoin.conf + File @abs_top_srcdir@/share/examples/namecoin.conf SetOutPath $INSTDIR\share\rpcauth File @abs_top_srcdir@/share/rpcauth/*.* SetOutPath $INSTDIR\daemon @@ -130,7 +130,7 @@ Section /o -un.Main UNSEC0000 Delete /REBOOTOK $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ Delete /REBOOTOK $INSTDIR\COPYING.txt Delete /REBOOTOK $INSTDIR\readme.txt - Delete /REBOOTOK $INSTDIR\bitcoin.conf + Delete /REBOOTOK $INSTDIR\namecoin.conf RMDir /r /REBOOTOK $INSTDIR\share RMDir /r /REBOOTOK $INSTDIR\daemon DeleteRegValue HKCU "${REGKEY}\Components" Main