Merge pull request #634 from coolbeans7/master
Various fixes related to typos
This commit is contained in:
commit
c1af9e8cef
|
@ -68,8 +68,8 @@ cd PyBitmessage && python src/bitmessagemain.py
|
||||||
```
|
```
|
||||||
|
|
||||||
##Creating a package for installation
|
##Creating a package for installation
|
||||||
If you really want, you can make a package for PyBitmessage which you may
|
If you really want, you can make a package for PyBitmessage, which you may
|
||||||
install yourself or distribute to friends. This isn't reccomended, since
|
install yourself or distribute to friends. This isn't recommended, since
|
||||||
PyBitmessage is in Beta, and subject to frequent change.
|
PyBitmessage is in Beta, and subject to frequent change.
|
||||||
|
|
||||||
####Linux
|
####Linux
|
||||||
|
@ -78,7 +78,7 @@ First off, since PyBitmessage uses something nifty called
|
||||||
[packagemonkey](https://github.com/fuzzgun/packagemonkey), go ahead and get
|
[packagemonkey](https://github.com/fuzzgun/packagemonkey), go ahead and get
|
||||||
that installed. You may have to build it from source.
|
that installed. You may have to build it from source.
|
||||||
|
|
||||||
Next, edit the generate.sh script. To your liking.
|
Next, edit the generate.sh script to your liking.
|
||||||
|
|
||||||
Now, run the appropriate script for the type of package you'd like to make
|
Now, run the appropriate script for the type of package you'd like to make
|
||||||
```
|
```
|
||||||
|
|
|
@ -4,7 +4,7 @@ PyBitmessage
|
||||||
Bitmessage is a P2P communications protocol used to send encrypted messages to
|
Bitmessage is a P2P communications protocol used to send encrypted messages to
|
||||||
another person or to many subscribers. It is decentralized and trustless,
|
another person or to many subscribers. It is decentralized and trustless,
|
||||||
meaning that you need-not inherently trust any entities like root certificate
|
meaning that you need-not inherently trust any entities like root certificate
|
||||||
authorities. It uses strong authentication which means that the sender of a
|
authorities. It uses strong authentication, which means that the sender of a
|
||||||
message cannot be spoofed, and it aims to hide "non-content" data, like the
|
message cannot be spoofed, and it aims to hide "non-content" data, like the
|
||||||
sender and receiver of messages, from passive eavesdroppers like those running
|
sender and receiver of messages, from passive eavesdroppers like those running
|
||||||
warrantless wiretapping programs.
|
warrantless wiretapping programs.
|
||||||
|
|
6
arch.sh
6
arch.sh
|
@ -24,14 +24,14 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
|
||||||
make clean
|
make clean
|
||||||
rm -f archpackage/*.gz
|
rm -f archpackage/*.gz
|
||||||
|
|
||||||
# having the root directory called name-version seems essential
|
# Having the root directory called name-version seems essential
|
||||||
mv ../${APP} ../${APP}-${VERSION}
|
mv ../${APP} ../${APP}-${VERSION}
|
||||||
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
|
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
|
||||||
|
|
||||||
# rename the root directory without the version number
|
# Rename the root directory without the version number
|
||||||
mv ../${APP}-${VERSION} ../${APP}
|
mv ../${APP}-${VERSION} ../${APP}
|
||||||
|
|
||||||
# calculate the MD5 checksum
|
# Calculate the MD5 checksum
|
||||||
CHECKSM=$(md5sum ${SOURCE})
|
CHECKSM=$(md5sum ${SOURCE})
|
||||||
sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD
|
sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
|
||||||
make clean
|
make clean
|
||||||
make
|
make
|
||||||
|
|
||||||
# change the parent directory name to debian format
|
# Change the parent directory name to Debian format
|
||||||
mv ../${APP} ../${DIR}
|
mv ../${APP} ../${DIR}
|
||||||
|
|
||||||
# Create a source archive
|
# Create a source archive
|
||||||
|
@ -38,9 +38,9 @@ make source
|
||||||
# Build the package
|
# Build the package
|
||||||
dpkg-buildpackage -F
|
dpkg-buildpackage -F
|
||||||
|
|
||||||
# sign files
|
# Sign files
|
||||||
gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
|
gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
|
||||||
gpg -ba ../${APP}_${VERSION}.orig.tar.gz
|
gpg -ba ../${APP}_${VERSION}.orig.tar.gz
|
||||||
|
|
||||||
# restore the parent directory name
|
# Restore the parent directory name
|
||||||
mv ../${DIR} ../${APP}
|
mv ../${DIR} ../${APP}
|
||||||
|
|
|
@ -21,13 +21,13 @@ sed -i "s/|${PREV_VERSION}|/|${VERSION}|/g" puppypackage/*.specs
|
||||||
sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
|
sed -i 's/VERSION='${PREV_VERSION}'/VERSION='${VERSION}'/g' puppypackage/pinstall.sh puppypackage/puninstall.sh
|
||||||
sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
|
sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
|
||||||
|
|
||||||
# create the source code in the SOURCES directory
|
# Create the source code in the SOURCES directory
|
||||||
make clean
|
make clean
|
||||||
mkdir -p ~/ebuild
|
mkdir -p ~/ebuild
|
||||||
rm -f ${SOURCE}
|
rm -f ${SOURCE}
|
||||||
mv ../${APP} ../${APP}-${VERSION}
|
mv ../${APP} ../${APP}-${VERSION}
|
||||||
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
|
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
|
||||||
|
|
||||||
# rename the root directory without the version number
|
# Rename the root directory without the version number
|
||||||
mv ../${APP}-${VERSION} ../${APP}
|
mv ../${APP}-${VERSION} ../${APP}
|
||||||
|
|
||||||
|
|
12
rpm.sh
12
rpm.sh
|
@ -24,25 +24,25 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links
|
||||||
sudo yum groupinstall "Development Tools"
|
sudo yum groupinstall "Development Tools"
|
||||||
sudo yum install rpmdevtools
|
sudo yum install rpmdevtools
|
||||||
|
|
||||||
# setup the rpmbuild directory tree
|
# Setup the rpmbuild directory tree
|
||||||
rpmdev-setuptree
|
rpmdev-setuptree
|
||||||
|
|
||||||
# create the source code in the SOURCES directory
|
# Create the source code in the SOURCES directory
|
||||||
make clean
|
make clean
|
||||||
mkdir -p ~/rpmbuild/SOURCES
|
mkdir -p ~/rpmbuild/SOURCES
|
||||||
rm -f ${SOURCE}
|
rm -f ${SOURCE}
|
||||||
|
|
||||||
# having the root directory called name-version seems essential
|
# Having the root directory called name-version seems essential
|
||||||
mv ../${APP} ../${APP}-${VERSION}
|
mv ../${APP} ../${APP}-${VERSION}
|
||||||
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
|
tar -cvzf ${SOURCE} ../${APP}-${VERSION} --exclude-vcs
|
||||||
|
|
||||||
# rename the root directory without the version number
|
# Rename the root directory without the version number
|
||||||
mv ../${APP}-${VERSION} ../${APP}
|
mv ../${APP}-${VERSION} ../${APP}
|
||||||
|
|
||||||
# copy the spec file into the SPECS directory
|
# Copy the spec file into the SPECS directory
|
||||||
cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS
|
cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS
|
||||||
|
|
||||||
# build
|
# Build
|
||||||
cd ~/rpmbuild/SPECS
|
cd ~/rpmbuild/SPECS
|
||||||
rpmbuild -ba ${APP}.spec
|
rpmbuild -ba ${APP}.spec
|
||||||
cd ${CURRDIR}
|
cd ${CURRDIR}
|
||||||
|
|
Reference in New Issue
Block a user