diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 21:21:08 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 21:21:08 +0000 |
| commit | 00c88ddea93f87db6fb81f7766c591c810de43ea (patch) | |
| tree | a88df2b61735d390cee11ca341fc96bf067887d2 /trunk/lib | |
| parent | 54736ec1c839e07edf0e5065bddf42dc9181c163 (diff) | |
| download | simplepkg-00c88ddea93f87db6fb81f7766c591c810de43ea.tar.gz simplepkg-00c88ddea93f87db6fb81f7766c591c810de43ea.tar.bz2 | |
fix slack-required parsing in gen_meta
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@559 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/lib')
| -rw-r--r-- | trunk/lib/common.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 0e70572..f298443 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -825,7 +825,7 @@ function gen_meta { LOCATION=$(echo $1 | sed -re "s/(.*)\/(.*.tgz)$/\1/") SIZE=$( expr `gunzip -l $1 | tail -n 1 | awk '{print $1}'` / 1024 ) USIZE=$( expr `gunzip -l $1 | tail -n 1 | awk '{print $2}'` / 1024 ) - REQUIRED=$(tar xzfO $1 install/slack-required 2>/dev/null | xargs -r -iZ echo -n "Z," | sed -e "s/,$//") + REQUIRED=$(tar xzfO $1 install/slack-required 2>/dev/null | grep -e -v "^#" | xargs -r -iZ echo -n "Z," | sed -e "s/,$//") CONFLICTS=$(tar xzfO $1 install/slack-conflicts 2>/dev/null | xargs -r -iZ echo -n "Z," | sed -e "s/,$//") SUGGESTS=$(tar xzfO $1 install/slack-suggests 2>/dev/null | xargs -r ) METAFILE=${NAME%tgz}meta |