From 6ca7a10796da3afea4dee311b2f48d7190e02fd1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 29 Jan 2013 14:40:34 -0500 Subject: mv /etc/libretools.d/pbs{,-convert}.conf --- Makefile | 6 +++--- config | 21 --------------------- pbs-convert.conf | 20 ++++++++++++++++++++ pbs-plumb-config | 4 ++-- 4 files changed, 25 insertions(+), 26 deletions(-) delete mode 100644 config create mode 100644 pbs-convert.conf diff --git a/Makefile b/Makefile index c3ee3b2..96fe6b2 100644 --- a/Makefile +++ b/Makefile @@ -2,18 +2,18 @@ PREFIX=/usr/local BINPROGS=$(shell find * -type f -executable) -all: $(BINPROGS) config +all: $(BINPROGS) pbs-convert.conf install: $(addprefix $(DESTDIR)$(PREFIX)/bin/,$(BINPROGS)) $(DESTDIR)/etc/libretools.d/pbs.conf uninstall: for f in $(BINPROGS); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done - rm -f $(DESTDIR)/etc/libretools.d/pbs.conf + rm -f $(DESTDIR)/etc/libretools.d/pbs-convert.conf $(DESTDIR)$(PREFIX)/bin/%: % | $(DESTDIR)$(PREFIX)/bin install -m755 '$*' '${@D}' -$(DESTDIR)/etc/libretools.d/pbs.conf: config | $(DESTDIR)/etc/libretools.d +$(DESTDIR)/etc/libretools.d/pbs-convert.conf: pbs-convert.conf | $(DESTDIR)/etc/libretools.d install -m644 '$*' '${@D}' $(DESTDIR)$(PREFIX)/bin $(DESTDIR)/etc/libretools.d: diff --git a/config b/config deleted file mode 100644 index 85c8003..0000000 --- a/config +++ /dev/null @@ -1,21 +0,0 @@ -[core] - cachedir = /var/cache/pbs - sourcedir = /var/pbs-sources - rewritedir = /var/pbs-rewrite - treedir = /var/pbs - -[source "arch-packages"] - type = absrepo - url = git://projects.archlinux.org/svntogit/packages.git - -[source "arch-community"] - type = absrepo - url = git://projects.archlinux.org/svntogit/community.git - -[source "parabola-abslibre"] - type = abstree - url = git://projects.parabolagnulinux.org/abslibre.git - -[source "parabola-abslibre-mips64el"] - type = abstree - url = git://projects.parabolagnulinux.org/abslibre-mips64el.git diff --git a/pbs-convert.conf b/pbs-convert.conf new file mode 100644 index 0000000..ee85bfa --- /dev/null +++ b/pbs-convert.conf @@ -0,0 +1,20 @@ +[core] + cachedir = /var/cache/pbs + sourcedir = /var/pbs-sources + rewritedir = /var/pbs-rewrite + +[source "arch-packages"] + type = absrepo + url = git://projects.archlinux.org/svntogit/packages.git + +[source "arch-community"] + type = absrepo + url = git://projects.archlinux.org/svntogit/community.git + +[source "parabola-abslibre"] + type = abstree + url = git://projects.parabolagnulinux.org/abslibre.git + +[source "parabola-abslibre-mips64el"] + type = abstree + url = git://projects.parabolagnulinux.org/abslibre-mips64el.git diff --git a/pbs-plumb-config b/pbs-plumb-config index 87cf189..bbb733f 100755 --- a/pbs-plumb-config +++ b/pbs-plumb-config @@ -15,7 +15,7 @@ list() { # stdout: The raw value of SETTING in FILE; *not* terminated by a newline ## get() { - [[ $# != 2 ]] && { usage; return 1; } + [[ $# != 2 ]] && { usage; return 1; } local file=$1 local setting=$2 git config --file "$file" -z --get "$setting" @@ -26,7 +26,7 @@ main() { local cmd=$1 shift - local file="/etc/libretools.d/pbs.conf" + local file="/etc/libretools.d/pbs-convert.conf" case "$cmd" in list) list "$file" "$@" -- cgit v1.1-4-g5e80