From 13294c6f0393c236803810b9ba92b8701f131dd9 Mon Sep 17 00:00:00 2001 From: Justin Davis Date: Fri, 20 Apr 2012 20:43:32 -0400 Subject: Add modpkg call to genpkg. Rename mention of tweaks to mods. --- bin/genpkg | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/genpkg b/bin/genpkg index 0aabe3d..f930879 100755 --- a/bin/genpkg +++ b/bin/genpkg @@ -4,7 +4,7 @@ prog=genpkg prepd=~/.genpkg/preps templd=~/.genpkg/templ -tweakd=~/pkg/tweaks +modsd=~/pkg/mods pkgd=~/pkg/dest vard=~/.genpkg/var @@ -64,9 +64,9 @@ then exit 2 fi -if ! [ -d "$tweakd" ] +if ! [ -d "$modsd" ] then - echo "$prog: bad package tweaks dir: $tweakd" 1>&2 + echo "$prog: bad package mods dir: $modsd" 1>&2 exit 1 fi @@ -99,11 +99,16 @@ do exit "$?" fi - #mod="$tweakd/$pkg" - #if [ -f "$twk" -a -r "$twk" ] && modmetapkg - #then - # echo "Modified metapackage." 1>&2 - #fi + mod="$modsd/$pkg" + if [ -f "$mod" -a -r "$mod" ] + then + if modpkg "$mod" + then + echo "Modified with $mod." 1>&2 + else + echo "$prog: modpkg failed." 1>&2 + fi + fi # Insert PKGBUILD fields into prefix of PKGBUILD body. cat PKGDATA | injectdigs | pbfields | putpkgtree PKGBUILD prefix body || exit "$?" -- cgit v1.2.3-24-g4f1b