From 5bb36505b1d0726f6d9fe373d222b15db5e5d18f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 30 Oct 2008 23:34:05 +0100 Subject: [PATCH] Rename helper-templates to just helpers. --HG-- extra : convert_revision : cbaa30da99805accbe250d8dee5494c78cb93291 --- {helper-templates => helpers}/automake.sh | 0 {helper-templates => helpers}/chroot.sh | 0 .../fontconfig-update.sh | 0 .../gtk-update-gdkpixbufloaders.sh | 0 .../gtk-update-icon-cache.sh | 0 .../gtk-update-immodules.sh | 0 .../mkfontxx-rebuild.sh | 0 .../pango-update-modules.sh | 0 {helper-templates => helpers}/perl-module.sh | 0 .../replace-interpreter.sh | 0 .../update-desktopdb.sh | 0 {helper-templates => helpers}/update-mimedb.sh | 0 {helper-templates => helpers}/xml-catalogs.sh | 0 templates/irssi.tmpl | 2 +- xbps.sh | 16 ++++++++-------- 15 files changed, 9 insertions(+), 9 deletions(-) rename {helper-templates => helpers}/automake.sh (100%) rename {helper-templates => helpers}/chroot.sh (100%) rename {helper-templates => helpers}/fontconfig-update.sh (100%) rename {helper-templates => helpers}/gtk-update-gdkpixbufloaders.sh (100%) rename {helper-templates => helpers}/gtk-update-icon-cache.sh (100%) rename {helper-templates => helpers}/gtk-update-immodules.sh (100%) rename {helper-templates => helpers}/mkfontxx-rebuild.sh (100%) rename {helper-templates => helpers}/pango-update-modules.sh (100%) rename {helper-templates => helpers}/perl-module.sh (100%) rename {helper-templates => helpers}/replace-interpreter.sh (100%) rename {helper-templates => helpers}/update-desktopdb.sh (100%) rename {helper-templates => helpers}/update-mimedb.sh (100%) rename {helper-templates => helpers}/xml-catalogs.sh (100%) diff --git a/helper-templates/automake.sh b/helpers/automake.sh similarity index 100% rename from helper-templates/automake.sh rename to helpers/automake.sh diff --git a/helper-templates/chroot.sh b/helpers/chroot.sh similarity index 100% rename from helper-templates/chroot.sh rename to helpers/chroot.sh diff --git a/helper-templates/fontconfig-update.sh b/helpers/fontconfig-update.sh similarity index 100% rename from helper-templates/fontconfig-update.sh rename to helpers/fontconfig-update.sh diff --git a/helper-templates/gtk-update-gdkpixbufloaders.sh b/helpers/gtk-update-gdkpixbufloaders.sh similarity index 100% rename from helper-templates/gtk-update-gdkpixbufloaders.sh rename to helpers/gtk-update-gdkpixbufloaders.sh diff --git a/helper-templates/gtk-update-icon-cache.sh b/helpers/gtk-update-icon-cache.sh similarity index 100% rename from helper-templates/gtk-update-icon-cache.sh rename to helpers/gtk-update-icon-cache.sh diff --git a/helper-templates/gtk-update-immodules.sh b/helpers/gtk-update-immodules.sh similarity index 100% rename from helper-templates/gtk-update-immodules.sh rename to helpers/gtk-update-immodules.sh diff --git a/helper-templates/mkfontxx-rebuild.sh b/helpers/mkfontxx-rebuild.sh similarity index 100% rename from helper-templates/mkfontxx-rebuild.sh rename to helpers/mkfontxx-rebuild.sh diff --git a/helper-templates/pango-update-modules.sh b/helpers/pango-update-modules.sh similarity index 100% rename from helper-templates/pango-update-modules.sh rename to helpers/pango-update-modules.sh diff --git a/helper-templates/perl-module.sh b/helpers/perl-module.sh similarity index 100% rename from helper-templates/perl-module.sh rename to helpers/perl-module.sh diff --git a/helper-templates/replace-interpreter.sh b/helpers/replace-interpreter.sh similarity index 100% rename from helper-templates/replace-interpreter.sh rename to helpers/replace-interpreter.sh diff --git a/helper-templates/update-desktopdb.sh b/helpers/update-desktopdb.sh similarity index 100% rename from helper-templates/update-desktopdb.sh rename to helpers/update-desktopdb.sh diff --git a/helper-templates/update-mimedb.sh b/helpers/update-mimedb.sh similarity index 100% rename from helper-templates/update-mimedb.sh rename to helpers/update-mimedb.sh diff --git a/helper-templates/xml-catalogs.sh b/helpers/xml-catalogs.sh similarity index 100% rename from helper-templates/xml-catalogs.sh rename to helpers/xml-catalogs.sh diff --git a/templates/irssi.tmpl b/templates/irssi.tmpl index 62aa74b2715..46f06e5cba8 100644 --- a/templates/irssi.tmpl +++ b/templates/irssi.tmpl @@ -3,7 +3,7 @@ pkgname=irssi version=0.8.12 distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2" # We need this to get some perl paths. -. $XBPS_TMPLHELPDIR/perl-module.sh +. $XBPS_HELPERSDIR/perl-module.sh configure_args="--with-proxy --with-perl-lib=$PERL_SITELIBEXP" build_style=gnu_configure short_desc="Secure and modular IRC client with text mode user interface" diff --git a/xbps.sh b/xbps.sh index 6b0a92bc45d..180693abfcc 100755 --- a/xbps.sh +++ b/xbps.sh @@ -67,14 +67,14 @@ set_defvars() # Directories : ${XBPS_TEMPLATESDIR:=$XBPS_DISTRIBUTIONDIR/templates} - : ${XBPS_TMPLHELPDIR:=$XBPS_DISTRIBUTIONDIR/helper-templates} + : ${XBPS_HELPERSDIR:=$XBPS_DISTRIBUTIONDIR/helpers} : ${XBPS_PKGDB_FPATH:=$XBPS_DESTDIR/.xbps-pkgdb.plist} : ${XBPS_UTILSDIR:=$XBPS_DISTRIBUTIONDIR/utils} : ${XBPS_DIGEST_CMD:=$XBPS_UTILSDIR/xbps-digest} : ${XBPS_PKGDB_CMD:=$XBPS_UTILSDIR/xbps-pkgdb} : ${XBPS_CMPVER_CMD:=$XBPS_UTILSDIR/xbps-cmpver} - local DDIRS="XBPS_TEMPLATESDIR XBPS_TMPLHELPDIR XBPS_UTILSDIR" + local DDIRS="XBPS_TEMPLATESDIR XBPS_HELPERSDIR XBPS_UTILSDIR" for i in ${DDIRS}; do eval val="\$$i" [ ! -d "$val" ] && msg_error "cannot find $i, aborting." @@ -728,7 +728,7 @@ configure_src_phase() # They are all handled by the helper perl-module.sh. # elif [ "$build_style" = "perl_module" ]; then - . $XBPS_TMPLHELPDIR/perl-module.sh + . $XBPS_HELPERSDIR/perl-module.sh perl_module_build $pkgname # @@ -1149,7 +1149,7 @@ install_pkg() [ -z "$origin_tmpl" ] && origin_tmpl=$pkgname if [ -z "$base_chroot" -a -z "$in_chroot" ]; then - run_file $XBPS_TMPLHELPDIR/chroot.sh + run_file $XBPS_HELPERSDIR/chroot.sh chroot_pkg_handler install $curpkgn return $? fi @@ -1300,7 +1300,7 @@ stow_pkg() fi for i in ${postinstall_helpers}; do - local pihf="$XBPS_TMPLHELPDIR/$i" + local pihf="$XBPS_HELPERSDIR/$i" [ -f "$pihf" ] && . $pihf done } @@ -1389,7 +1389,7 @@ case "$target" in build) setup_tmpl $2 if [ -z "$base_chroot" -a -z "$in_chroot" ]; then - run_file $XBPS_TMPLHELPDIR/chroot.sh + run_file $XBPS_HELPERSDIR/chroot.sh chroot_pkg_handler build $2 else fetch_distfiles $2 @@ -1403,13 +1403,13 @@ build) fi ;; chroot) - run_file $XBPS_TMPLHELPDIR/chroot.sh + run_file $XBPS_HELPERSDIR/chroot.sh chroot_pkg_handler chroot dummy ;; configure) setup_tmpl $2 if [ -z "$base_chroot" -a -z "$in_chroot" ]; then - run_file $XBPS_TMPLHELPDIR/chroot.sh + run_file $XBPS_HELPERSDIR/chroot.sh chroot_pkg_handler configure $2 else fetch_distfiles $2