summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-09 18:29:22 +0200
committerKali Kaneko <kali@leap.se>2013-09-09 18:29:22 +0200
commitd838e31b03ca23fafa4d2d32cbf52cd6d4e88287 (patch)
tree661c3d37f7842227676586805b2b254174f528ac
parenta7d8cbb050b10b6f45913e04800d6209c90dd4a4 (diff)
parent3d7ceef972571dc898448e572dd70bf77cd91b8e (diff)
Merge remote-tracking branch 'ivan-github/bug/3617_remove-exec-bit-update-docs' into develop
-rw-r--r--changes/bug-3617_remove-exec-bits-from-text-in-bundle1
-rw-r--r--docs/release_checklist.wiki2
-rwxr-xr-xpkg/linux/build_bundle.sh12
3 files changed, 8 insertions, 7 deletions
diff --git a/changes/bug-3617_remove-exec-bits-from-text-in-bundle b/changes/bug-3617_remove-exec-bits-from-text-in-bundle
new file mode 100644
index 00000000..caf3a62e
--- /dev/null
+++ b/changes/bug-3617_remove-exec-bits-from-text-in-bundle
@@ -0,0 +1 @@
+ o Remove execution bits in text files in bundle. Closes #3617.
diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki
index e6467048..273804c7 100644
--- a/docs/release_checklist.wiki
+++ b/docs/release_checklist.wiki
@@ -27,7 +27,7 @@
* [ ] git checkout develop && git pull origin develop && git merge release-X.Y.Z && git push origin develop
* [ ] Build and upload bundles
* [ ] Use the scripts under pkg/<os>/ to build the the bundles.
- * [ ] Sign them with gpg -a <path/to/bundle>
+ * [ ] Sign them with gpg -a --sign --detach-sign <path/to/bundle>
* [ ] Upload bundle and signature to web-uploads@salmon.leap.se:~/public/client/<os>/Bitmask-<os>-<ver>.(tar.bz2,dmg,zip)
* [ ] Update symbolic link for latest upload and signature:
* [ ] ~/public/client/Bitmask-<os>-latest
diff --git a/pkg/linux/build_bundle.sh b/pkg/linux/build_bundle.sh
index e6a1043f..879579f0 100755
--- a/pkg/linux/build_bundle.sh
+++ b/pkg/linux/build_bundle.sh
@@ -77,13 +77,13 @@ cp $JOINT_CHANGELOG $TEMPLATE_BUNDLE/CHANGELOG
cp $REPOS_ROOT/leap_client/LICENSE $TEMPLATE_BUNDLE/LICENSE
-# clean pyc$
-
+# clean *.pyc files
cd $TEMPLATE_BUNDLE
-for i in $(find . | grep pyc$);
- do
- rm $i
- done
+find . -name "*.pyc" -delete
+
+# remove execution flags (because vbox fs) and set all read permissions
+chmod -x CHANGELOG LICENSE README
+chmod +r CHANGELOG LICENSE README
# create tarball