[gentoo-commits] proj/hardened-refpolicy:next commit in: gentoo/

[Sven Vermeulen]

commit:     88326fb9c8a25da67709418ca5f328261defce23
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon Nov 24 10:12:14 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 10:15:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=88326fb9

make the gentoo release script a little more user-agnostic

---
 gentoo/release-prepare.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh
index 073ff58..afeed8f 100644
--- a/gentoo/release-prepare.sh
+++ b/gentoo/release-prepare.sh
@@ -7,7 +7,8 @@
 
 TRANSLATE="s:\(${HARDENEDREFPOL}\|${REFPOLRELEASE}\):refpolicy/:g";
 NEWVERSION="${1}";
-REMOTELOCATION="swift@××××××××××.org:public_html/patches/selinux-base-policy";
+# If remote requires a different username, it should be set in ~/.ssh/config
+REMOTELOCATION="dev.gentoo.org:/home/swift/public_html/patches/selinux-base-policy";
 
 usage() {
   echo "Usage: $0 <newversion>";
@@ -20,12 +21,12 @@ usage() {
   echo "The following environment variables must be declared correctly for the script";
   echo "to function properly:";
   echo "  - GENTOOX86 should point to the gentoo-x86 checkout";
-  echo "    E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86\"";
+  echo "    E.g. export GENTOOX86=\"/home/user/dev/gentoo-x86/\"";
   echo "  - HARDENEDREFPOL should point to the hardened-refpolicy.git checkout";
-  echo "    E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy\"";
+  echo "    E.g. export HARDENEDREFPOL=\"/home/user/dev/hardened-refpolicy/\"";
   echo "  - REFPOLRELEASE should point to the current latest /release/ of the reference"
   echo "    policy (so NOT to a checkout), extracted somewhere on the file system."
-  echo "    E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424\"";
+  echo "    E.g. export REFPOLRELEASE=\"/home/user/local/refpolicy-20130424/\"";
 }
 
 assertDirEnvVar() {
@@ -98,7 +99,7 @@ tagRelease() {
   printf "Creating tag ${NEWVERSION} in our repository... ";
   cd ${HARDENEDREFPOL};
   git tag -a ${NEWVERSION} -m "Release set of ${NEWVERSION}" > /dev/null 2>&1 || die "Failed to create tag";
-  git push origin ${NEWVERSION} > /dev/null 2>&1 || die "Faield to push tag to origin repository";
+  git push origin ${NEWVERSION} > /dev/null 2>&1 || die "Failed to push tag to origin repository";
   printf "done\n";
 };