diff options
author | Justin Davis <jrcd83@gmail.com> | 2012-04-21 02:43:32 +0200 |
---|---|---|
committer | Justin Davis <jrcd83@gmail.com> | 2012-04-21 02:43:32 +0200 |
commit | 13294c6f0393c236803810b9ba92b8701f131dd9 (patch) | |
tree | 8103e53b11e6998902665bbc715540cdd9e0b992 | |
parent | 5906da30cf09d00481d7e000dfac9149a7715cf2 (diff) | |
download | genpkg-13294c6f0393c236803810b9ba92b8701f131dd9.tar.gz genpkg-13294c6f0393c236803810b9ba92b8701f131dd9.tar.xz |
Add modpkg call to genpkg.
Rename mention of tweaks to mods.
-rwxr-xr-x | bin/genpkg | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -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 "$?" |