From 648750ef5c6e5f7d7b443a9ebfc1cfe986ffb8ee Mon Sep 17 00:00:00 2001 From: coolbeans7 Date: Fri, 24 Jan 2014 08:16:28 -0800 Subject: [PATCH 1/6] Updated Install.md Noticed a few typos --- INSTALL.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 0d7b6c61..111db5d9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -68,8 +68,8 @@ cd PyBitmessage && python src/bitmessagemain.py ``` ##Creating a package for installation -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 +If you really want, you can make a package for PyBitmessage, which you may +install yourself or distribute to friends. This isn't recommended, since PyBitmessage is in Beta, and subject to frequent change. ####Linux @@ -78,7 +78,7 @@ First off, since PyBitmessage uses something nifty called [packagemonkey](https://github.com/fuzzgun/packagemonkey), go ahead and get 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 ``` From ab49956759e11eddb890b8d26a2b8be6b53d1fd2 Mon Sep 17 00:00:00 2001 From: coolbeans7 Date: Fri, 24 Jan 2014 08:17:50 -0800 Subject: [PATCH 2/6] Update README.md Just a typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c725c3bc..73b5329c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ PyBitmessage Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, 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 sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs. From 0e310849ca639585568885891b878f4df9050dc7 Mon Sep 17 00:00:00 2001 From: coolbeans7 Date: Fri, 24 Jan 2014 08:19:29 -0800 Subject: [PATCH 3/6] Update arch.sh Sentence cased some comments --- arch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch.sh b/arch.sh index e025ddcf..64c903a7 100755 --- a/arch.sh +++ b/arch.sh @@ -24,14 +24,14 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links make clean 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} 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} -# calculate the MD5 checksum +# Calculate the MD5 checksum CHECKSM=$(md5sum ${SOURCE}) sed -i "s/md5sums[^)]*)/md5sums=(${CHECKSM%% *})/g" archpackage/PKGBUILD From d9c60d8e5f6fa98f1a3eb3e33362d21c81c1d290 Mon Sep 17 00:00:00 2001 From: coolbeans7 Date: Fri, 24 Jan 2014 08:20:28 -0800 Subject: [PATCH 4/6] Update debian.sh Sentence cased some comments, capitalized a noun --- debian.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.sh b/debian.sh index d80d9db9..0cb07fff 100755 --- a/debian.sh +++ b/debian.sh @@ -29,7 +29,7 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links make clean make -# change the parent directory name to debian format +# Change the parent directory name to Debian format mv ../${APP} ../${DIR} # Create a source archive @@ -38,9 +38,9 @@ make source # Build the package dpkg-buildpackage -F -# sign files +# Sign files gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb gpg -ba ../${APP}_${VERSION}.orig.tar.gz -# restore the parent directory name +# Restore the parent directory name mv ../${DIR} ../${APP} From 525a6ec58b6aacdbabca93e92626f9854460ba59 Mon Sep 17 00:00:00 2001 From: coolbeans7 Date: Fri, 24 Jan 2014 08:21:01 -0800 Subject: [PATCH 5/6] Update ebuild.sh Sentence cased other comments --- ebuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebuild.sh b/ebuild.sh index 59295718..e5550355 100755 --- a/ebuild.sh +++ b/ebuild.sh @@ -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/-'${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 mkdir -p ~/ebuild rm -f ${SOURCE} mv ../${APP} ../${APP}-${VERSION} 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} From e133b907691fa5bfbd1bea7f3af06d53b52e09fe Mon Sep 17 00:00:00 2001 From: coolbeans7 Date: Fri, 24 Jan 2014 08:22:01 -0800 Subject: [PATCH 6/6] Update rpm.sh A bit more sentence casing. --- rpm.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rpm.sh b/rpm.sh index 074a4515..9b67ba61 100755 --- a/rpm.sh +++ b/rpm.sh @@ -24,25 +24,25 @@ sed -i 's/-'${PREV_VERSION}'.so/-'${VERSION}'.so/g' debian/*.links sudo yum groupinstall "Development Tools" sudo yum install rpmdevtools -# setup the rpmbuild directory tree +# Setup the rpmbuild directory tree rpmdev-setuptree -# create the source code in the SOURCES directory +# Create the source code in the SOURCES directory make clean mkdir -p ~/rpmbuild/SOURCES 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} 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} -# copy the spec file into the SPECS directory +# Copy the spec file into the SPECS directory cp -f rpmpackage/${APP}.spec ~/rpmbuild/SPECS -# build +# Build cd ~/rpmbuild/SPECS rpmbuild -ba ${APP}.spec cd ${CURRDIR}