Added source to PKGBUILD instead of using drush to fetch it, removed pkgver(), prepare(), and build() functions, and added to $source any missing or outdated modules.

2 files changed, 24 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21f62d332767..e2aa1c522d9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,17 @@
 pkgbase = aegir-hostmaster
 	pkgdesc = mass Drupal hosting system - frontend
-	pkgver = 7.x_3.4
+	pkgver = 7.x_3.6
 	pkgrel = 1
 	url = http://aegirproject.org
 	arch = any
 	license = GPL
 	depends = drush>=7
+	source = https://ftp.drupal.org/files/projects/hostmaster-7.x-3.6-core.tar.gz
+	source = https://ftp.drupal.org/files/projects/devel_debug_log-7.x-1.2.tar.gz
+	source = https://ftp.drupal.org/files/projects/devel-7.x-1.5.tar.gz
+	md5sums = 642925101fa0a842601b5d6e35741d02
+	md5sums = 19561aa1a0f2e549acf5c44a8cad8e14
+	md5sums = f06c912eb4edbd48fbcc2867516726a3
 
 pkgname = aegir-hostmaster
 
diff --git a/PKGBUILD b/PKGBUILD
index af75fc271f52..b83607e73dac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,30 @@
 # Maintainer: James An <james@jamesan.ca>
 
-_pkgname=hostmaster
-pkgname=aegir-$_pkgname
-pkgver=7.x_3.4
+pkgname=aegir-hostmaster
+_pkgname=${pkgname##*-}
+pkgver=7.x_3.6
 pkgrel=1
 pkgdesc="mass Drupal hosting system - frontend"
 arch=('any')
 url='http://aegirproject.org'
 license=('GPL')
 depends=('drush>=7')
-
-pkgver() {
-    drush rl --default-major=7 --fields=version --field-labels=0 $_pkgname | sort | grep -v 'dev' | tail -n1 | tr '-' '_' | tr -d ' '
-}
-
-prepare() {
-    msg2 'Fetching hostmaster...'
-    drush dl --default-major=7 $_pkgname --yes --drupal-project-rename=$_pkgname &>/dev/null
-
-    msg2 'Fetching latest version of hostmaster extensions...'
-    for TYPE in modules themes; do
-        for DIR in $_pkgname/profiles/$_pkgname/$TYPE/*/*; do
-            EXT=$(basename $DIR)
-            VER_DO=$(drush rl --default-major=7 $EXT --fields=version,status --pipe |& grep -v -- '-dev' | grep Supported | head -n1 | cut -f1 -d,)
-            VER_HM=$(grep 'version = ' $DIR/$EXT.info | tail -n1 | cut -f2 -d\")
-            if [[ "$VER_HM" < "$VER_DO" ]]; then
-                msg2 "  Fetching $EXT..."
-                drush dl --default-major=7 $EXT --yes --destination=$TYPE &>/dev/null
-            fi
-        done
-    done
-
-    msg2 'Fetching devel and devel_debug_log (missing extension dependency)...'
-    for EXT in devel devel_debug_log; do
-        msg2 "  Fetching $EXT..."
-        drush dl --default-major=7 $EXT --yes --destination=modules
-    done
-}
-
-build() {
-    msg2 'Merging extensions into hostmaster...'
-    for TYPE in modules themes; do
-        if [ -d $TYPE ]; then
-            cp -r $TYPE/* $_pkgname/sites/all/$TYPE
-        fi
-    done
-    mkdir -m755 $_pkgname/sites/all/drush
-}
+source=("https://ftp.drupal.org/files/projects/$_pkgname-${pkgver//_/-}-core.tar.gz"
+        "https://ftp.drupal.org/files/projects/devel_debug_log-7.x-1.2.tar.gz"
+        "https://ftp.drupal.org/files/projects/devel-7.x-1.5.tar.gz")
+md5sums=('642925101fa0a842601b5d6e35741d02'
+         '19561aa1a0f2e549acf5c44a8cad8e14'
+         'f06c912eb4edbd48fbcc2867516726a3')
 
 package() {
-    install -dm755 "$pkgdir/usr/share/webapps"
-    cp -r $_pkgname "$pkgdir/usr/share/webapps"
+  install -dm755 "$pkgdir/usr/share/webapps/$_pkgname/sites/all/drush"
+  install -dm755 "$pkgdir/usr/share/webapps/$_pkgname/sites/all/modules"
+  cp -r $_pkgname-${pkgver//_/-}/* "$pkgdir/usr/share/webapps/$_pkgname"
+  cp -r devel devel_debug_log "$pkgdir/usr/share/webapps/$_pkgname/sites/all/modules"
 
-    install -Dm644 <( ) "$pkgdir/usr/share/webapps/$_pkgname/sites/all/drush/drushrc.php"
-    install -Dm644 <( ) "$pkgdir/usr/share/webapps/$_pkgname/sites/sites.php"
+  touch "$pkgdir/usr/share/webapps/$_pkgname/sites/all/drush/drushrc.php"
+  touch "$pkgdir/usr/share/webapps/$_pkgname/sites/sites.php"
 
-    msg2 'Fixing file permissions...'
-    find "$pkgdir/usr/share/webapps/$_pkgname" -perm /u+w -exec chmod g+w {} +
-    chown -R http:http "$pkgdir/usr/share/webapps/$_pkgname"
+  find "$pkgdir/usr/share/webapps/$_pkgname" -perm /u+w -exec chmod g+w {} +
+  chown -R http:http "$pkgdir/usr/share/webapps/$_pkgname"
 }