From 6b008827e1cd2953ca1015a135c8aaf130c7dd27 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Tue, 14 Jun 2011 18:23:17 -0300 Subject: Fixed epoch and rolled back ban_file and queue_file because they were missing if you don't have a custom libretools.conf but only a main one in /etc (like I do :) --- fullpkg | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'fullpkg') diff --git a/fullpkg b/fullpkg index cbf2e47..9dd2ad8 100755 --- a/fullpkg +++ b/fullpkg @@ -10,13 +10,13 @@ source /usr/bin/libremessages # Avoid /libretools dir doesn't exist errors if [ -z $XDG_CONFIG_HOME ]; then error "There's no XDG_CONFIG_HOME var set" - OFLINE=true -elif [ -r $XDG_CONFIG_HOME/libretools/libretools.conf ]; then + exit 1 +fi # set queue_file and ban_file +[ -e $XDG_CONFIG_HOME/libretools/libretools.conf ] && \ source $XDG_CONFIG_HOME/libretools/libretools.conf - queue_file=$XDG_CONFIG_HOME/libretools/queue - ban_file=$XDG_CONFIG_HOME/libretools/ban -fi +queue_file=$XDG_CONFIG_HOME/libretools/queue +ban_file=$XDG_CONFIG_HOME/libretools/ban ##### START FUNCTIONS ##### @@ -138,7 +138,7 @@ get_full_version() { function cleanup { # Do nothing OR # Already cleaned - [ "${do_cleanup}" = "n" || ! -d ${build_dir} ] && return 0 + [[ "${do_cleanup}" = "n" || ! -d ${build_dir} ]] && return 0 # Only do cleanup on level 0 msg "Cleaning up..." @@ -152,6 +152,7 @@ function find_deps { source PKGBUILD local repo=${repo:-$(guess_repo)} local pkgbase=${pkgbase:-${pkgname[0]}} + local epoch=${epoch:-0} local fullver=$(get_full_version ${epoch} ${pkgver} ${pkgrel}) # If package and correct ${fullver} is built exit -- cgit v1.2.3-54-g00ecf