summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xfullpkg-ng4
-rwxr-xr-xpkgbuild-check-nonfree5
2 files changed, 6 insertions, 3 deletions
diff --git a/fullpkg-ng b/fullpkg-ng
index afa1c08..7dda8d2 100755
--- a/fullpkg-ng
+++ b/fullpkg-ng
@@ -309,7 +309,6 @@ pkgs=$(cat $build_dir/log | grep "built:") && {
error "Those packages were built and installed:"
plain "$(echo ${pkgs[@]} | cut -d: -f2)"
msg "Uploading packages to the server"
- librerelease
}
pkgs=$(cat $build_dir/log | grep "failed:") && {
error "Those packages failed to build:"
@@ -320,4 +319,7 @@ pkgs=$(cat $build_dir/log | grep "unstaged:") && {
plain "$(cat $build_dir/log | grep "unstaged:" | cut -d: -f2)"
}
+msg "All done"
+plain "Check if your system works fine and librerelease if it does"
+
exit 0 \ No newline at end of file
diff --git a/pkgbuild-check-nonfree b/pkgbuild-check-nonfree
index 774c72f..f3fcd95 100755
--- a/pkgbuild-check-nonfree
+++ b/pkgbuild-check-nonfree
@@ -23,7 +23,8 @@ source /etc/libretools.conf
[[ -f $XDG_CONFIG_HOME/libretools/libretools.conf ]] && \
source $XDG_CONFIG_HOME/libretools/libretools.conf
-pushd $(mktemp -d) >/dev/null
+mkdir -p $XDG_CONFIG_HOME/libretools
+pushd $XDG_CONFIG_HOME/libretools/ >/dev/null
# This is the exit status.
ev=0
@@ -38,7 +39,7 @@ ev=0
msg "Downloading the blacklist of proprietary software packages."
wget -N -q -O blacklist.txt "${BLACKLIST}" 2>/dev/null || {
error "Download failed, exiting"
- exit 1
+ [ -e $XDG_CONFIG_HOME/libretools/blacklist.txt ] || exit 1
}
# Get everything before the `:' in the blacklist (that's the names of the