diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-05 20:00:57 -0600 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-05 20:00:57 -0600 |
commit | 80401ac7e842df245c41fee340f32f7fcedd80f1 (patch) | |
tree | 3fc4844b728d8b564c17fcddba7803959178c8b2 /src/chroot-tools | |
parent | 4ae03b417dec34a237a2a36410800e5ed5042d7d (diff) |
Phase out `load_conf_*` and `check_conf_*` functions
Replace their usages with `load_files *` and `check_vars *`
Diffstat (limited to 'src/chroot-tools')
-rwxr-xr-x | src/chroot-tools/librechroot | 3 | ||||
-rwxr-xr-x | src/chroot-tools/libremakepkg | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 0fd621b..80c7f4f 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -21,7 +21,8 @@ # along with Parabola. If not, see <http://www.gnu.org/licenses/>. . $(librelib conf.sh) -load_conf_libretools_chroot +load_files chroot +[[ -f /.arch-chroot ]] || check_vars chroot CHROOTDIR CHROOT . libremessages . $(librelib makechrootpkg) diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index f1b3916..b86506a 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -21,7 +21,8 @@ # along with Parabola. If not, see <http://www.gnu.org/licenses/>. . $(librelib conf.sh) -load_conf_libretools_chroot +load_files chroot +[[ -f /.arch-chroot ]] || check_vars chroot CHROOTDIR CHROOT . libremessages makechrootpkg=$(librelib makechrootpkg) |