Skip to content

Commit

Permalink
[Branding] bitcoin -> navcoin
Browse files Browse the repository at this point in the history
  • Loading branch information
mxaddict committed Feb 16, 2024
1 parent 19faab4 commit 5221574
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions contrib/devtools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ options, as all its configuration is set at the top of the file. It runs many ti
pypy3 contrib/devtools/headerssync-params.py
```

gen-bitcoin-conf.sh
gen-navcoin-conf.sh
===================

Generates a navcoin.conf file in `share/examples/` by parsing the output from `navcoind --help`. This script is run during the
Expand All @@ -112,7 +112,7 @@ repository. To use this tool with out-of-tree builds set `BUILDDIR`. For
example:

```bash
BUILDDIR=$PWD/build contrib/devtools/gen-bitcoin-conf.sh
BUILDDIR=$PWD/build contrib/devtools/gen-navcoin-conf.sh
```

security-check.py and test-security-check.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ BUILDDIR=${BUILDDIR:-$TOPDIR}
BINDIR=${BINDIR:-$BUILDDIR/src}
BITCOIND=${BITCOIND:-$BINDIR/bitcoind}
SHARE_EXAMPLES_DIR=${SHARE_EXAMPLES_DIR:-$TOPDIR/share/examples}
EXAMPLE_CONF_FILE=${EXAMPLE_CONF_FILE:-$SHARE_EXAMPLES_DIR/bitcoin.conf}
EXAMPLE_CONF_FILE=${EXAMPLE_CONF_FILE:-$SHARE_EXAMPLES_DIR/navcoin.conf}

[ ! -x "$BITCOIND" ] && echo "$BITCOIND not found or not executable." && exit 1

Expand All @@ -22,19 +22,19 @@ fi
if [ -n "$DIRTY" ]
then
echo -e "WARNING: $BITCOIND was built from a dirty tree.\n"
echo -e "To safely generate a bitcoin.conf file, please commit your changes to $BITCOIND, rebuild, then run this script again.\n"
echo -e "To safely generate a navcoin.conf file, please commit your changes to $BITCOIND, rebuild, then run this script again.\n"
fi

echo 'Generating example bitcoin.conf file in share/examples/'
echo 'Generating example navcoin.conf file in share/examples/'

# create the directory, if it doesn't exist
mkdir -p "${SHARE_EXAMPLES_DIR}"

# create the header text
cat > "${EXAMPLE_CONF_FILE}" << 'EOF'
##
## bitcoin.conf configuration file.
## Generated by contrib/devtools/gen-bitcoin-conf.sh.
## navcoin.conf configuration file.
## Generated by contrib/devtools/gen-navcoin-conf.sh.
##
## Lines beginning with # are comments.
## All possible configuration options are provided. To use, copy this file
Expand Down
4 changes: 2 additions & 2 deletions contrib/guix/libexec/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@ mkdir -p "$DISTSRC"
;;
esac

# copy over the example bitcoin.conf file. if contrib/devtools/gen-bitcoin-conf.sh
# copy over the example navcoin.conf file. if contrib/devtools/gen-navcoin-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/navcoin.conf" "${DISTNAME}/"

cp -r "${DISTSRC}/share/rpcauth" "${DISTNAME}/share/"

Expand Down
8 changes: 4 additions & 4 deletions contrib/init/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Sample configuration files for:
```
systemd: bitcoind.service
Upstart: bitcoind.conf
OpenRC: bitcoind.openrc
bitcoind.openrcconf
systemd: navcoind.service
Upstart: navcoind.conf
OpenRC: navcoind.openrc
navcoind.openrcconf
CentOS: bitcoind.init
macOS: org.bitcoin.bitcoind.plist
```
Expand Down
2 changes: 1 addition & 1 deletion contrib/init/bitcoind.conf → contrib/init/navcoind.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env BITCOIND_GROUP="bitcoin"
env BITCOIND_PIDDIR="/var/run/bitcoind"
# upstart can't handle variables constructed with other variables
env BITCOIND_PIDFILE="/var/run/bitcoind/bitcoind.pid"
env BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf"
env BITCOIND_CONFIGFILE="/etc/bitcoin/navcoin.conf"
env BITCOIND_DATADIR="/var/lib/bitcoind"

expect fork
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else
BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoind"
fi

BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bitcoin/bitcoin.conf}
BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bitcoin/navcoin.conf}
BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind}
BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid}
BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# /etc/conf.d/bitcoind: config file for /etc/init.d/bitcoind

# Config file location
#BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf"
#BITCOIND_CONFIGFILE="/etc/bitcoin/navcoin.conf"

# What directory to write pidfile to? (created and owned by $BITCOIND_USER)
#BITCOIND_PIDDIR="/var/run/bitcoind"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# It is not recommended to modify this file in-place, because it will
# be overwritten during package upgrades. If you want to add further
# options or overwrite existing ones then use
# $ systemctl edit bitcoind.service
# $ systemctl edit navcoind.service
# See "man systemd.service" for details.

# Note that almost all daemon options could be specified in
# /etc/bitcoin/bitcoin.conf, but keep in mind those explicitly
# /etc/bitcoin/navcoin.conf, but keep in mind those explicitly
# specified as arguments in ExecStart= will override those in the
# config file.

Expand All @@ -19,7 +19,7 @@ Wants=network-online.target

[Service]
ExecStart=/usr/bin/bitcoind -pid=/run/bitcoind/bitcoind.pid \
-conf=/etc/bitcoin/bitcoin.conf \
-conf=/etc/bitcoin/navcoin.conf \
-datadir=/var/lib/bitcoind \
-startupnotify='systemd-notify --ready' \
-shutdownnotify='systemd-notify --stopping'
Expand Down
File renamed without changes.

0 comments on commit 5221574

Please sign in to comment.