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/chroot-tools/librechroot | 4 +- src/chroot-tools/libremakepkg | 11 ++--- src/devtools/Makefile | 24 +++++++--- src/lib/Makefile | 10 ++++- src/lib/blacklist.sh | 100 ----------------------------------------- src/lib/conf.sh | 1 + src/lib/libreblacklist | 101 ++++++++++++++++++++++++++++++++++++++++++ src/lib/libremessages | 70 +++++++++++++++++++++++++++++ src/librefetch/librefetch | 2 +- src/librelib | 60 +++++++++++++++++++++++++ src/libremessages | 69 ----------------------------- src/libretools.conf | 4 +- src/pkgbuild-check-nonfree | 2 +- 13 files changed, 270 insertions(+), 188 deletions(-) delete mode 100755 src/lib/blacklist.sh create mode 100755 src/lib/libreblacklist create mode 100755 src/lib/libremessages create mode 100755 src/librelib delete mode 100755 src/libremessages (limited to 'src') diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 5027938..5afce05 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -20,11 +20,11 @@ # You should have received a copy of the GNU General Public License # along with Parabola. If not, see . -. /usr/share/libretools/conf.sh +. $(librelib conf.sh) load_conf_libretools_chroot . libremessages -. /usr/share/devtools/makechrootpkg.sh +. $(librelib makechrootpkg) # Because the makechrootpkg.sh library functions don't work with -euE normshell() ( diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index cdd2f39..f1b3916 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -20,10 +20,11 @@ # You should have received a copy of the GNU General Public License # along with Parabola. If not, see . -. /usr/share/libretools/conf.sh +. $(librelib conf.sh) load_conf_libretools_chroot . libremessages +makechrootpkg=$(librelib makechrootpkg) shopt -s nullglob umask 0022 @@ -74,7 +75,7 @@ EOF # Usage: add_to_local_repo $copydir $pkgfiles... add_to_local_repo() ( set +euE - . /usr/share/devtools/makechrootpkg.sh + . $makechrootpkg chroot_add_to_local_repo "$@" ) @@ -84,7 +85,7 @@ add_to_local_repo() ( # - $SRCDEST is set chroot_copy_in() ( set +euE - . /usr/share/devtools/makechrootpkg.sh + . $makechrootpkg chroot_copy_in "$@" ) @@ -94,7 +95,7 @@ chroot_copy_in() ( # - $PKGDEST is set chroot_copy_out() ( set +euE - . /usr/share/devtools/makechrootpkg.sh + . $makechrootpkg chroot_copy_out_pkgs "$@" chroot_copy_out_logs "$@" chroot_copy_out_srcs "$@" @@ -103,7 +104,7 @@ chroot_copy_out() ( # Usage: chroot_let_nobody_use_pacman $copydir chroot_let_nobody_use_pacman() ( set +euE - . /usr/share/devtools/makechrootpkg.sh + . $makechrootpkg chroot_let_nobody_use_pacman "$@" ) diff --git a/src/devtools/Makefile b/src/devtools/Makefile index e357675..18f1518 100644 --- a/src/devtools/Makefile +++ b/src/devtools/Makefile @@ -4,13 +4,21 @@ DESTDIR= #prefix=/usr/local prefix=/usr exec_prefix=$(prefix) -datarootdir=$(prefix)/share - bindir=$(exec_prefix)/bin sbindir=$(exec_prefix)/sbin +#libexecdir=$(exec_prefix)/libexec +libexecdir=$(exec_prefix)/lib + +datarootdir=$(prefix)/share datadir=$(datarootdir) +#sysconfdir=$(prefix)/etc +sysconfdir=/etc + +docdir=$(datarootdir)/doc + +################################################################################ -pkgdatadir=$(datadir)/devtools +pkglibexecdir=$(libexecdir)/libretools devtoolsdir=../../../devtools-par @@ -47,7 +55,7 @@ build: \ lib/common.sh \ lib/makechrootpkg.sh -edit = sed -e 's|m4_include(lib/\(.*\))|. @pkgdatadir@/\1|' -e "s|@pkgdatadir[@]|$(pkgdatadir)|g" +edit = sed -e 's|m4_include(lib/\(.*\))|. $$(librelib \1)|' indent = emacs --batch $1 \ --eval '(setq sh-basic-offset 8)' \ @@ -62,6 +70,8 @@ indent = emacs --batch $1 \ lib/common.sh: %: %.in Makefile @echo "GEN $@" @{ \ + echo '#!/bin/bash -euE' && \ + echo '#!/bin/bash' && \ echo 'if [[ -z $${_INCLUDE_COMMON_SH:-} ]]; then' && \ echo '_INCLUDE_COMMON_SH=true' && \ cat "$<" && \ @@ -86,8 +96,8 @@ install: \ $(DESTDIR)$(bindir)/find-libprovides \ $(DESTDIR)$(bindir)/finddeps \ $(DESTDIR)$(bindir)/lddd \ - $(DESTDIR)$(pkgdatadir)/common.sh \ - $(DESTDIR)$(pkgdatadir)/makechrootpkg.sh + $(DESTDIR)$(pkglibexecdir)/common.sh \ + $(DESTDIR)$(pkglibexecdir)/makechrootpkg.sh $(DESTDIR)$(sbindir)/%: % install -Dm755 $< $@ @@ -95,7 +105,7 @@ $(DESTDIR)$(sbindir)/%: % $(DESTDIR)$(bindir)/%: % install -Dm755 $< $@ -$(DESTDIR)$(pkgdatadir)/%: lib/% +$(DESTDIR)$(pkglibexecdir)/%: lib/% install -Dm644 $< $@ $(DESTDIR)$(bindir)/find-libprovides: 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 diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch index 1d4dd5c..f73beca 100755 --- a/src/librefetch/librefetch +++ b/src/librefetch/librefetch @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with Parabola. If not, see . -. /usr/share/libretools/conf.sh +. $(librelib conf.sh) . libremessages declare -r tempdir="$(mktemp -d --tmpdir ${0##*/}.XXXXXXXXXXX)" diff --git a/src/librelib b/src/librelib new file mode 100755 index 0000000..22811db --- /dev/null +++ b/src/librelib @@ -0,0 +1,60 @@ +#!/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 . + +default_libdir=/usr/lib/libretools + +cmd=${0##*/} +usage() { + print 'Usage: . $(%s LIBRARY)' "$cmd" + print "Finds a shell library file" + echo + print "While some libraries can be sourced just by their name because" + print "they are installed in PATH (like libremessages), some are not" + print "installed there (like conf.sh), so path must be given." + print "Hardcoding that path is the way of the dark side." + echo + print "By default, it looks for the files in '%s'," "$default_libdir" + print "but this can be changed with the environmental variable" + print "LIBRETOOLS_LIBDIR." + echo + print "Example usage:" + print ' . $(librelib conf.sh)' +} + +main() { + if [[ $# != 1 ]]; then + usage >&2 + return 2 + fi + + if [[ -z $LIBRETOOLS_LIBDIR ]]; then + export LIBRETOOLS_LIBDIR=$default_libdir + fi + + lib=$1 + lib=${lib#libre} + lib=${lib%.sh} + + for file in ${lib} libre${lib} ${lib}.sh libre${lib}.sh; do + if [[ -f "$LIBRETOOLS_LIBDIR/$file" ]]; then + printf '%s\n' "$LIBRETOOLS_LIBDIR/$file" + return 0; + fi + done + return 1 +} + +main "$@" diff --git a/src/libremessages b/src/libremessages deleted file mode 100755 index 726daa5..0000000 --- a/src/libremessages +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -euE -# 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 # -################################################################################ - -. /usr/share/devtools/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 diff --git a/src/libretools.conf b/src/libretools.conf index 3477761..df0471e 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -88,11 +88,11 @@ TORUPATH=/var/lib/libretools/toru ################################################################################ if [[ -z ${INCLUDE_CONF_SH:-} ]]; then - . /usr/share/libretools/conf.sh + . $(librelib conf.sh) if [[ -e "$XDG_CONFIG_HOME/libretools/libretools.conf" ]]; then . "$XDG_CONFIG_HOME/libretools/libretools.conf" fi check_conf_libretools || exit $? - . /usr/bin/libremessages + . libremessages fi diff --git a/src/pkgbuild-check-nonfree b/src/pkgbuild-check-nonfree index e20e1a3..c37b0bf 100755 --- a/src/pkgbuild-check-nonfree +++ b/src/pkgbuild-check-nonfree @@ -20,7 +20,7 @@ # along with Parabola. If not, see . . libremessages -. /usr/share/libretools/blacklist.sh +. libreblacklist # Unset any PKGBUILD variables inherited from the environment # I took these from makepkg 4.1.1-1 -- cgit v1.2.2