From ca6db7290cacee0d3b5ba836e6acea76ea314e50 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 26 May 2013 22:11:51 -0400 Subject: redo the library system; avoid hard-coded paths * install all library files to $(libexecdir)/libretools, instead of - $(bindir) - $(datadir)/libretools - $(datadir)/devtools * symlink the executable library files into $(bindir) * add the tool `librelib` * instead of ". /path/to/lib.sh", use ". $(librelib lib.sh)" * mark all libraries with shebangs of what options they support * move blacklist.sh to libreblacklist --- src/lib/Makefile | 10 ++++- src/lib/blacklist.sh | 100 ------------------------------------------------ src/lib/conf.sh | 1 + src/lib/libreblacklist | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/libremessages | 70 ++++++++++++++++++++++++++++++++++ 5 files changed, 181 insertions(+), 101 deletions(-) delete mode 100755 src/lib/blacklist.sh create mode 100755 src/lib/libreblacklist create mode 100755 src/lib/libremessages (limited to 'src/lib') diff --git a/src/lib/Makefile b/src/lib/Makefile index 0c69ba3..e1068c1 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -1,2 +1,10 @@ -libre_datadir=$(datadir)/libretools +libre_execdir=$(bindir) +libre_datadir=$(libexecdir)/libretools include ../../common.mk + +rootdir=$(shell sed -r 's|^/||;s|[^/]+|..|g'<<<$(bindir)) + +$(DESTDIR)$(libre_execdir)/%: % + install -Dm755 '$<' '$(DESTDIR)$(libre_datadir)/$(@F)' + install -d '$(@D)' + ln -sf '$(rootdir)$(libre_datadir)/$(@F)' "$@" diff --git a/src/lib/blacklist.sh b/src/lib/blacklist.sh deleted file mode 100755 index 664b5f3..0000000 --- a/src/lib/blacklist.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -euE -# Copyright (c) 2013 by Luke Shumaker -# -# 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 . - -# make sure XDG_CACHE_HOME is set -. /usr/share/libretools/conf.sh - -# Usage: blacklist-normalize <$file -# Normalizes the syntax of the blacklist on stdin. -blacklist-normalize() { - sed -e 's/^[^:]*$/&::/' -e 's/^[^:]*:[^:]*$/&:/' -} - -# Usage: blacklist-cat -# Prints the blacklist -# Uses the chache, but downloads it if it doesn't exist. Also normalizes the -# blacklist for easier parsing. -blacklist-cat() { - local file="$XDG_CACHE_HOME/libretools/blacklist.txt" - if ! [[ -e $file ]]; then - # exit on failure, whether set -e or not - blacklist-update || return $? - fi - blacklist-normalize < "$file" -} - -# Usage: blacklist-update -# Updates (or creates) the cached copy of the blacklist -blacklist-update() ( - set -euE # allow it to not be set globally - . libremessages - load_files libretools - check_vars BLACKLIST - - local remote_blacklist="$BLACKLIST" - local local_blacklist="$XDG_CACHE_HOME/libretools/blacklist.txt" - - stat_busy "Downloading blacklist of proprietary software packages" - - mkdir -p "${local_blacklist%/*}" - if wget -N -q -O "${local_blacklist}.part" "$remote_blacklist" 2>/dev/null; then - stat_done - mv "${local_blacklist}.part" "$local_blacklist" - else - stat_done - rm "${local_blacklist}.part" - if [[ -e "$local_blacklist" ]]; then - warning "Using local copy of blacklist" - else - error "Download failed, exiting" - return 1 - fi - - fi -) - -# Usage: blacklist-cat | blacklist-lookup $pkgname -# Filters to obtain the line for $pkgname from the blacklist on stdin. -# Exits successfully whether a line is found or not. -blacklist-lookup() { - local pkg=$1 - # we accept that $pkg contains no regex-nes - blacklist-cat | grep "^$pkg:" || true -} - -# Usage: blacklist-{cat|lookup} | blacklist-get-pkg -# Outputs only the package name field of the blacklist line(s) on stdin. -blacklist-get-pkg() { - cut -d: -f1 -} - -# Usage: blacklist-{cat|lookup} | blacklist-get-rep -# Outputs only the replacement package field of the blacklist line(s) on stdin. -blacklist-get-rep() { - cut -d: -f2 -} - -# Usage: blacklist-{cat|lookup} | blacklist-get-reason -# Outputs only the reason field of the blacklist line(s) on stdin. -blacklist-get-reason() { - cut -d: -f3- -} - -if [[ "${0##*/}" == libreblacklist ]]; then - _blacklist_cmd=$1 - shift - "blacklist-$_blacklist_cmd" "$@" -fi diff --git a/src/lib/conf.sh b/src/lib/conf.sh index 73dfca4..8e8610e 100644 --- a/src/lib/conf.sh +++ b/src/lib/conf.sh @@ -1,3 +1,4 @@ +#!/bin/bash -euE #!/bin/bash # Copyright (c) 2012-2013 by Luke Shumaker # diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist new file mode 100755 index 0000000..2f73a06 --- /dev/null +++ b/src/lib/libreblacklist @@ -0,0 +1,101 @@ +#!/bin/bash -euE +#!/bin/bash +# Copyright (c) 2013 by Luke Shumaker +# +# 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 . + +# make sure XDG_CACHE_HOME is set +. $(librelib conf.sh) + +# Usage: blacklist-normalize <$file +# Normalizes the syntax of the blacklist on stdin. +blacklist-normalize() { + sed -e 's/^[^:]*$/&::/' -e 's/^[^:]*:[^:]*$/&:/' +} + +# Usage: blacklist-cat +# Prints the blacklist +# Uses the chache, but downloads it if it doesn't exist. Also normalizes the +# blacklist for easier parsing. +blacklist-cat() { + local file="$XDG_CACHE_HOME/libretools/blacklist.txt" + if ! [[ -e $file ]]; then + # exit on failure, whether set -e or not + blacklist-update || return $? + fi + blacklist-normalize < "$file" +} + +# Usage: blacklist-update +# Updates (or creates) the cached copy of the blacklist +blacklist-update() ( + set -euE # allow it to not be set globally + . libremessages + load_files libretools + check_vars BLACKLIST + + local remote_blacklist="$BLACKLIST" + local local_blacklist="$XDG_CACHE_HOME/libretools/blacklist.txt" + + stat_busy "Downloading blacklist of proprietary software packages" + + mkdir -p "${local_blacklist%/*}" + if wget -N -q -O "${local_blacklist}.part" "$remote_blacklist" 2>/dev/null; then + stat_done + mv "${local_blacklist}.part" "$local_blacklist" + else + stat_done + rm "${local_blacklist}.part" + if [[ -e "$local_blacklist" ]]; then + warning "Using local copy of blacklist" + else + error "Download failed, exiting" + return 1 + fi + + fi +) + +# Usage: blacklist-cat | blacklist-lookup $pkgname +# Filters to obtain the line for $pkgname from the blacklist on stdin. +# Exits successfully whether a line is found or not. +blacklist-lookup() { + local pkg=$1 + # we accept that $pkg contains no regex-nes + blacklist-cat | grep "^$pkg:" || true +} + +# Usage: blacklist-{cat|lookup} | blacklist-get-pkg +# Outputs only the package name field of the blacklist line(s) on stdin. +blacklist-get-pkg() { + cut -d: -f1 +} + +# Usage: blacklist-{cat|lookup} | blacklist-get-rep +# Outputs only the replacement package field of the blacklist line(s) on stdin. +blacklist-get-rep() { + cut -d: -f2 +} + +# Usage: blacklist-{cat|lookup} | blacklist-get-reason +# Outputs only the reason field of the blacklist line(s) on stdin. +blacklist-get-reason() { + cut -d: -f3- +} + +if [[ "${0##*/}" == libreblacklist ]]; then + _blacklist_cmd=$1 + shift + "blacklist-$_blacklist_cmd" "$@" +fi diff --git a/src/lib/libremessages b/src/lib/libremessages new file mode 100755 index 0000000..c9b6b83 --- /dev/null +++ b/src/lib/libremessages @@ -0,0 +1,70 @@ +#!/bin/bash -euE +#!/bin/bash +# Copyright (c) 2002-2006 by Judd Vinet +# Copyright (c) 2006-2010 Pacman Development Team +# Copyright (c) 2005 by Aurelien Foret +# Copyright (c) 2005 by Christian Hamar +# Copyright (c) 2006 by Alex Smith +# Copyright (c) 2006 by Andras Voroskoi +# Copyright (c) 2006 by Miklos Vajna +# Copyright (c) 2011 by Joshua Haase +# Copyright (c) 2012-2013 by Luke Shumaker +# +# 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 . + +################################################################################ +# Inherit most functions from devtools # +################################################################################ + +. $(librelib common.sh) + +################################################################################ +# gettext initialization # +################################################################################ + +export TEXTDOMAIN='libretools' +export TEXTDOMAINDIR='/usr/share/locale' + +################################################################################ +# Own functions # +################################################################################ + +# Usage: print fmt arg1 arg2... +# Like printf, but gettext-aware, and prints a trailing newline +print() { + local fmt=$1 + shift + printf -- "$(gettext "$fmt")\n" "$@" +} + +# Usage: term_title This will be the term title +# Sets the terminal title +term_title() { + local fmt='' + case "$TERM" in + screen|tmux) fmt='\ek%s\e\\';; + xterm*|rxvt*) fmt='\e]0;%s\a';; + esac + printf "$fmt" "$*" +} + +################################################################################ +# Run one of the defined functions if invoked directly # +################################################################################ + +if [[ "${0##*/}" == libremessages ]]; then + _libremessages_cmd=$1 + shift + "$_libremessages_cmd" "$@" +fi -- cgit v1.2.2