From 8d32d903f9e6a9ad65d7433199b982ee02de39ad Mon Sep 17 00:00:00 2001 From: "totten@civicrm.org" Date: Sat, 21 Jun 2014 04:10:55 -0700 Subject: [PATCH] distmaker - Extract function dm_install_l10n() --- distmaker/dists/common.sh | 7 +++++++ distmaker/dists/l10n.sh | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh index dedde33563..c9a0687e9e 100644 --- a/distmaker/dists/common.sh +++ b/distmaker/dists/common.sh @@ -113,6 +113,13 @@ function dm_install_joomla() { dm_install_dir "$repo" "$to" } +## usage: dm_install_l10n +function dm_install_l10n() { + local repo="$1" + local to="$2" + dm_install_dir "$repo" "$to" +} + ## Generate civicrm-version.php ## usage: dm_generate_version function dm_generate_version() { diff --git a/distmaker/dists/l10n.sh b/distmaker/dists/l10n.sh index df19397a92..6666b31baa 100644 --- a/distmaker/dists/l10n.sh +++ b/distmaker/dists/l10n.sh @@ -15,6 +15,8 @@ else . $CFFILE fi +. "$P/common.sh" + RSYNCOPTIONS="-avC $DM_EXCLUDES_RSYNC --include=core" RSYNCCOMMAND="$DM_RSYNC $RSYNCOPTIONS" SRC=$DM_SOURCEDIR @@ -26,11 +28,7 @@ if [ -d $TRG ] ; then fi # copy all the stuff -for CODE in l10n; do - echo $CODE - [ -d $SRC/$CODE ] && $RSYNCCOMMAND $SRC/$CODE $TRG -done - +dm_install_l10n "$SRC/l10n" "$TRG/l10n" # copy selected sqls if [ ! -d $TRG/sql ] ; then -- 2.25.1