From 5c2dd97a91421e6e5f7e920579fcb88bb71e7fa7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 13 Jan 2013 18:41:31 -0500
Subject: use /usr/share/devtools/makechrootpkg.sh instead of *.gpl2

---
 src/chroot-tools/librechroot | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/chroot-tools/librechroot')

diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index 89fb644..7f113f5 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -24,12 +24,7 @@
 load_conf_libretools_chroot
 
 . "$(which libremessages)"
-
-# This file (librechroot) is GPLv3+, but I would like to use some code
-# modified from devtools' "makechrootpkg", which is GPLv2.
-. "$(dirname "$0")/librechroot.gpl2"
-# This gives us the functions:
-#  - sync
+. /usr/share/devtools/makechrootpkg.sh
 
 cleanup=(':');
 cleanup() {
@@ -120,7 +115,7 @@ main() {
 	fi
 
 	if [[ ! -d $copydir ]] && [[ $mode != sync ]]; then
-		sync
+		chroot_sync
 	fi
 
 	mkdir -p $copydir/etc/libretools.d
@@ -160,7 +155,7 @@ main() {
 		install_pkg) archroot "${archroot_args[@]}" "${copydir}" -i $ARG ;;
 		noop) :;;
 		run)         archroot "${archroot_args[@]}" "${copydir}" -r "$ARG" ;;
-		sync) sync;;
+		sync) chroot_sync;;
 		update)      archroot "${archroot_args[@]}" "${copydir}" -u ;;
 		enter)       archroot "${archroot_args[@]}" "${copydir}" -r bash ;;
 	esac
-- 
cgit v1.2.2