summaryrefslogtreecommitdiff
path: root/src/chroot-tools/libremakepkg
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-05-26 22:11:51 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-05-26 22:11:51 -0400
commitca6db7290cacee0d3b5ba836e6acea76ea314e50 (patch)
tree7cf3e4eda33335fdcc245d41e75a3b1602485266 /src/chroot-tools/libremakepkg
parentb159a370e2b1458c8c3817bdf3cabe2a630732e3 (diff)
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
Diffstat (limited to 'src/chroot-tools/libremakepkg')
-rwxr-xr-xsrc/chroot-tools/libremakepkg11
1 files changed, 6 insertions, 5 deletions
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 <http://www.gnu.org/licenses/>.
-. /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 "$@"
)