begone with db-libremessages

5 files changed, 15 insertions, 88 deletions

diff --git a/cron-jobs/db-cleanup b/cron-jobs/db-cleanup
index ffa2601..ce0e5f7 100755
--- a/cron-jobs/db-cleanup
+++ b/cron-jobs/db-cleanup
@@ -15,8 +15,8 @@ trap_exit() {
 	exit 1
 }
 
-source "$(dirname "$(readlink -e "$0")")/config"
-source "$(dirname "$(readlink -e "$0")")/db-libremessages"
+source "$(dirname $(dirname "$(readlink -e "$0")"))/config"
+source "$(librelib messages)"
 
 # From makepkg
 set -E
diff --git a/db-import-any-to-ours b/db-import-any-to-ours
index a901d54..8a4e874 100755
--- a/db-import-any-to-ours
+++ b/db-import-any-to-ours
@@ -8,7 +8,7 @@ trap_exit() {
 }
 
 source "$(dirname "$(readlink -e "$0")")/config"
-source "$(dirname "$(readlink -e "$0")")/db-libremessages"
+source "$(librelib messages)"
 
 # From makepkg
 set -E
diff --git a/db-import-pkg-archlinux b/db-import-pkg-archlinux
index 81221fd..d20d095 100755
--- a/db-import-pkg-archlinux
+++ b/db-import-pkg-archlinux
@@ -190,9 +190,14 @@ trap_exit() {
 	kill "-$signal" "$$"
 }
 
+fatal_error() {
+	error "$@"
+	exit 1
+}
+
 source "$(dirname "$(readlink -e "$0")")/config"
 source "$(dirname "$(readlink -e "$0")")/db-import-pkg-archlinux.conf"
-source "$(dirname "$(readlink -e "$0")")/db-libremessages"
+source "$(librelib messages)"
 
 # Check variables presence
 for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do
diff --git a/db-import-pkg-archlinuxarm b/db-import-pkg-archlinuxarm
index c707e5b..a512278 100755
--- a/db-import-pkg-archlinuxarm
+++ b/db-import-pkg-archlinuxarm
@@ -179,9 +179,14 @@ trap_exit() {
 	kill "-$signal" "$$"
 }
 
+fatal_error() {
+	error "$@"
+	exit 1
+}
+
 source "$(dirname "$(readlink -e "$0")")/config"
 source "$(dirname "$(readlink -e "$0")")/db-import-pkg-archlinuxarm.conf"
-source "$(dirname "$(readlink -e "$0")")/db-libremessages"
+source "$(librelib messages)"
 
 # Check variables presence
 for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do
diff --git a/db-libremessages b/db-libremessages
deleted file mode 100644
index 37df149..0000000
--- a/db-libremessages
+++ /dev/null
@@ -1,83 +0,0 @@
-#   Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
-#   Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
-#   Copyright (c) 2005 by Aurelien Foret <orelien@chez.com>
-#   Copyright (c) 2006 by Miklos Vajna <vmiklos@frugalware.org>
-#   Copyright (c) 2005 by Christian Hamar <krics@linuxforum.hu>
-#   Copyright (c) 2006 by Alex Smith <alex@alex-smith.me.uk>
-#   Copyright (c) 2006 by Andras Voroskoi <voroskoi@frugalware.org>
-#   Copyright (c) 2011 by Joshua Haase <hahj87@gmail.com>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# gettext initialization
-export TEXTDOMAIN='libretools'
-export TEXTDOMAINDIR='/usr/share/locale'
-
-# check if messages are to be printed using color
-unset ALL_OFF BOLD BLUE GREEN RED YELLOW
-
-if tput setaf 0 &>/dev/null; then
-	ALL_OFF="$(tput sgr0)"
-	BOLD="$(tput bold)"
-	BLUE="${BOLD}$(tput setaf 4)"
-	GREEN="${BOLD}$(tput setaf 2)"
-	RED="${BOLD}$(tput setaf 1)"
-	YELLOW="${BOLD}$(tput setaf 3)"
-	PURPLE="${ALL_OFF}$(tput setaf 5)"
-else
-	ALL_OFF="\033[1;0m"
-	BOLD="\033[1;1m"
-	BLUE="${BOLD}\033[1;34m"
-	GREEN="${BOLD}\033[1;32m"
-	RED="${BOLD}\033[1;31m"
-	YELLOW="${BOLD}\033[1;33m"
-	PURPLE="${BOLD}\033[1;30;40m"
-fi
-
-stdnull() {
-	local action=$1;
-	eval "${action} >/dev/null 2>&1"
-}
-
-plain() {
-	local mesg=$1; shift
-	printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg() {
-	local mesg=$1; shift
-	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg2() {
-	local mesg=$1; shift
-	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-warning() {
-	local mesg=$1; shift
-	printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
-	local mesg=$1; shift
-	printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-fatal_error() {
-	local mesg=$1; shift
-	error "$mesg" "$@"
-
-	exit 1
-}