summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rwxr-xr-xconfigs/lxde-openrc/build.sh2
-rwxr-xr-xconfigs/profile-openrc/build.sh2
-rwxr-xr-xconfigs/profile/build.sh2
-rwxr-xr-xconfigs/talkingparabola/build.sh2
-rwxr-xr-xparabolaiso/mkparabolaiso6
6 files changed, 18 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7259d1b..7dd4e36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=34
+V=$(shell git describe --exact-match)
INSTALL_FILES=$(wildcard parabolaiso/initcpio/install/*)
HOOKS_FILES=$(wildcard parabolaiso/initcpio/hooks/*)
@@ -35,7 +35,10 @@ install-doc:
install -m 644 -t $(DOC_DIR) $(DOC_FILES)
dist:
- git archive --format=tar --prefix=parabolaiso-$(V)/ v$(V) | gzip -9 > parabolaiso-$(V).tar.gz
+ git archive --format=tar --prefix=parabolaiso-$(V)/ $(V) | gzip -9 > parabolaiso-$(V).tar.gz
gpg --detach-sign --use-agent parabolaiso-$(V).tar.gz
-.PHONY: install install-program install-initcpio install-examples install-doc dist
+upload:
+ scp parabolaiso-$(V).tar.gz parabolaiso-$(V).tar.gz.sig repo.parabola.nu:/srv/repo/main/other/parabolaiso
+
+.PHONY: install install-program install-initcpio install-examples install-doc dist upload
diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh
index 725605a..f31cbd4 100755
--- a/configs/lxde-openrc/build.sh
+++ b/configs/lxde-openrc/build.sh
@@ -45,6 +45,8 @@ _usage ()
exit ${1}
}
+umask 0022
+
# Helper function to run make_*() only one time per architecture.
run_once() {
if [[ ! -e ${work_dir}/build.${1}_${arch} ]]; then
diff --git a/configs/profile-openrc/build.sh b/configs/profile-openrc/build.sh
index 2f5721c..ece7edb 100755
--- a/configs/profile-openrc/build.sh
+++ b/configs/profile-openrc/build.sh
@@ -44,6 +44,8 @@ _usage ()
exit ${1}
}
+umask 0022
+
# Helper function to run make_*() only one time per architecture.
run_once() {
if [[ ! -e ${work_dir}/build.${1}_${arch} ]]; then
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 89ac09a..84b0b5c 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -22,6 +22,8 @@ script_path=$(readlink -f ${0%/*})
# Default is systemd
init=systemd
+umask 0022
+
_usage ()
{
echo "usage ${0} [options]"
diff --git a/configs/talkingparabola/build.sh b/configs/talkingparabola/build.sh
index 7432e6e..3d4f325 100755
--- a/configs/talkingparabola/build.sh
+++ b/configs/talkingparabola/build.sh
@@ -22,6 +22,8 @@ script_path=$(readlink -f ${0%/*})
# Default is systemd
init=systemd
+umask 0022
+
_usage ()
{
echo "usage ${0} [options]"
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index d55668d..4475244 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -161,9 +161,9 @@ _pacman ()
_msg_info "Installing packages to '${work_dir}/airootfs/'..."
if [[ "${quiet}" = "y" ]]; then
- pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/airootfs" $* &> /dev/null
+ pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $* &> /dev/null
else
- pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/airootfs" $*
+ pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $*
fi
_msg_info "Packages installed successfully!"
@@ -374,6 +374,8 @@ if [[ ${EUID} -ne 0 ]]; then
_msg_error "This script must be run as root." 1
fi
+umask 0022
+
while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:i:vh' arg; do
case "${arg}" in
p) pkg_list="${pkg_list} ${OPTARG}" ;;