Fix inconsistencies and grammar in various files
This commit is contained in:
MeshCollider
parent
234ffc677e
commit
41f3e84aac
8 changed files with 22 additions and 22 deletions
|
|
@ -35,7 +35,7 @@ PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md)
|
|||
Scripts and notes for Mac builds.
|
||||
|
||||
### [RPM](/contrib/rpm) ###
|
||||
RPM spec file for building bitcoin-core on RPM based distributions
|
||||
RPM spec file for building bitcoin-core on RPM based distributions.
|
||||
|
||||
### [Gitian-build](/contrib/gitian-build.sh) ###
|
||||
Script for running full Gitian builds.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ _bitcoind() {
|
|||
;;
|
||||
*)
|
||||
|
||||
# only parse -help if senseful
|
||||
# only parse -help if sensible
|
||||
if [[ -z "$cur" || "$cur" =~ ^- ]]; then
|
||||
local helpopts
|
||||
helpopts=$($bitcoind -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
|
||||
|
|
|
|||
|
|
@ -40,15 +40,15 @@ version Version number, commit, or branch to build. If building a commit or bra
|
|||
Options:
|
||||
-c|--commit Indicate that the version argument is for a commit or branch
|
||||
-u|--url Specify the URL of the repository. Default is https://github.com/bitcoin/bitcoin
|
||||
-v|--verify Verify the gitian build
|
||||
-b|--build Do a gitian build
|
||||
-v|--verify Verify the Gitian build
|
||||
-b|--build Do a Gitian build
|
||||
-s|--sign Make signed binaries for Windows and Mac OSX
|
||||
-B|--buildsign Build both signed and unsigned binaries
|
||||
-o|--os Specify which Operating Systems the build is for. Default is lwx. l for linux, w for windows, x for osx
|
||||
-j Number of processes to use. Default 2
|
||||
-m Memory to allocate in MiB. Default 2000
|
||||
--kvm Use KVM instead of LXC
|
||||
--setup Setup the gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
|
||||
--setup Set up the Gitian building environment. Uses KVM. If you want to use lxc, use the --lxc option. Only works on Debian-based systems (Ubuntu, Debian)
|
||||
--detach-sign Create the assert file for detached signing. Will not commit anything.
|
||||
--no-commit Do not commit anything to git
|
||||
-h|--help Print this help message
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
### Gavin's notes on getting gitian builds up and running using KVM
|
||||
### Gavin's notes on getting Gitian builds up and running using KVM
|
||||
|
||||
These instructions distilled from
|
||||
[https://help.ubuntu.com/community/KVM/Installation](https://help.ubuntu.com/community/KVM/Installation).
|
||||
|
|
@ -56,10 +56,10 @@ Here's a description of Gavin's setup on OSX 10.6:
|
|||
|
||||
4. Inside the running Ubuntu desktop, install:
|
||||
|
||||
sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
|
||||
sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
|
||||
|
||||
5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above:
|
||||
|
||||
export USE_LXC=1
|
||||
git clone git://github.com/bitcoin/bitcoin.git
|
||||
... etc
|
||||
export USE_LXC=1
|
||||
git clone git://github.com/bitcoin/bitcoin.git
|
||||
... etc
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ PGP keys
|
|||
|
||||
This folder contains the public keys of developers and active contributors.
|
||||
|
||||
The keys are mainly used to sign git commits or the build results of gitian
|
||||
The keys are mainly used to sign git commits or the build results of Gitian
|
||||
builds.
|
||||
|
||||
You can import the keys into gpg as follows. Also, make sure to fetch the
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ pre-start script
|
|||
echo
|
||||
echo "This password is security critical to securing wallets "
|
||||
echo "and must not be the same as the rpcuser setting."
|
||||
echo "You can generate a suitable random password using the following"
|
||||
echo "You can generate a suitable random password using the following "
|
||||
echo "command from the shell:"
|
||||
echo
|
||||
echo "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
|
||||
echo
|
||||
echo "It is also recommended that you also set alertnotify so you are "
|
||||
echo "It is recommended that you also set alertnotify so you are "
|
||||
echo "notified of problems:"
|
||||
echo
|
||||
echo "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \
|
||||
|
|
|
|||
|
|
@ -76,12 +76,12 @@ checkconfig()
|
|||
eerror ""
|
||||
eerror "This password is security critical to securing wallets "
|
||||
eerror "and must not be the same as the rpcuser setting."
|
||||
eerror "You can generate a suitable random password using the following"
|
||||
eerror "You can generate a suitable random password using the following "
|
||||
eerror "command from the shell:"
|
||||
eerror ""
|
||||
eerror "bash -c 'tr -dc a-zA-Z0-9 < /dev/urandom | head -c32 && echo'"
|
||||
eerror ""
|
||||
eerror "It is also recommended that you also set alertnotify so you are "
|
||||
eerror "It is recommended that you also set alertnotify so you are "
|
||||
eerror "notified of problems:"
|
||||
eerror ""
|
||||
eerror "ie: alertnotify=echo %%s | mail -s \"Bitcoin Alert\"" \
|
||||
|
|
|
|||
|
|
@ -84,16 +84,16 @@ If you would prefer not to build the GUI at all, you can pass the switch
|
|||
|
||||
The desktop and KDE meta files are created in the spec file itself with the
|
||||
`cat` command. This is done to allow easy distribution specific changes without
|
||||
needing to use any patches. A specific time stamp is given to the files so that
|
||||
needing to use any patches. A specific timestamp is given to the files so that
|
||||
it does not they do not appear to have been updated every time the package is
|
||||
built. If you do make changes to them, you probably should update time stamp
|
||||
assigned to them in the `touch` command that specifies the time stamp.
|
||||
built. If you do make changes to them, you probably should update timestamp
|
||||
assigned to them in the `touch` command that specifies the timestamp.
|
||||
|
||||
## SVG, PNG, and XPM Icons
|
||||
|
||||
The `bitcoin.svg` file is from the source listed as `Source100`. It is used as
|
||||
the source for the PNG and XPM files. The generated PNG and XPM files are given
|
||||
the same time stamp as the source SVG file as a means of indicating they are
|
||||
the same timestamp as the source SVG file as a means of indicating they are
|
||||
derived from it.
|
||||
|
||||
## Systemd
|
||||
|
|
@ -105,10 +105,10 @@ distributions that still receive vendor updates do in fact use systemd.
|
|||
The files to control the service are created in the RPM spec file itself using
|
||||
the `cat` command. This is done to make it easy to modify for other
|
||||
distributions that may implement things differently without needing to patch
|
||||
source. A specific time stamp is given to the files so that they do not appear
|
||||
source. A specific timestamp is given to the files so that they do not appear
|
||||
to have been updated every time the package is built. If you do make changes to
|
||||
them, you probably should update the time stamp assigned to them in the `touch`
|
||||
command that specifies the time stamp.
|
||||
them, you probably should update the timestamp assigned to them in the `touch`
|
||||
command that specifies the timestamp.
|
||||
|
||||
## SELinux
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue