[all tools]: use conf.sh (and libremessages if necessary)

1 files changed, 7 insertions, 10 deletions

diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index 5a98cf8..265550f 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -21,8 +21,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Parabola. If not, see <http://www.gnu.org/licenses/>.
 
-source /etc/libretools.conf
-custom_config=$XDG_CONFIG_HOME/libretools/libretools.conf
+. libremessages
+. $(librelib conf.sh)
+load_files libretools
+check_vars libretools WORKDIR PARABOLAHOST LIBREDESTDIR SIGID || exit 1
+# The following variables are actually optional
+#check_vars libretools SIGEXT HOOKPRERELEASE || exit 1
 
 function usage {
     echo "$(gettext "Usage: $0")"
@@ -108,17 +112,10 @@ while getopts 'hlcn' arg; do
     esac
 done
 
-[[ -e $custom_config ]] && source $custom_config
-
 [[ ! -z ${HOOKPRERELEASE} ]] && bash -c "${HOOKPRERELEASE}"
 
 clean_non_packages
-if [ ! -z "${SIGID}" ]; then
-    sign_packages
-else
-    error "Package signing is *required*, please set SIGID on your libretools.conf"
-    exit 1
-fi
+sign_packages
 
 # Make the permissions of the packages 644 otherwise the user will get access
 # denied error when they try to download (rsync --no-perms doesn't seem to