diff options
| author | Christian Rößler | 2013-08-28 14:22:37 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-08-28 14:22:37 +0200 |
| commit | 3d4ce18d809b86afe0c5a61f585b885a4ed29ee5 (patch) | |
| tree | 9b05b9641e7d3c18de867cbee303243daa4d63c2 /helper/fileutil.inc | |
| parent | [vbox] addon-init for systemd service (diff) | |
| parent | [fileutil.inc] list_packet_files: Ignore output lines that do not start with ... (diff) | |
| download | tm-scripts-3d4ce18d809b86afe0c5a61f585b885a4ed29ee5.tar.gz tm-scripts-3d4ce18d809b86afe0c5a61f585b885a4ed29ee5.tar.xz tm-scripts-3d4ce18d809b86afe0c5a61f585b885a4ed29ee5.zip | |
Tried to amend single commentary for many files: New vbox module
[not complete]
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
helper/fileutil.inc
Diffstat (limited to 'helper/fileutil.inc')
| -rw-r--r-- | helper/fileutil.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/helper/fileutil.inc b/helper/fileutil.inc index c0b9d69a..abab7903 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -38,9 +38,9 @@ list_packet_files() { [ "x$OPTIONAL" = "x@" ] && PACKAGE="$(echo "$PACKAGE" | cut -c 2-)" local FILES="" if [ "$PACKET_HANDLER" = "dpkg" ]; then - FILES="$(dpkg -L "$PACKAGE" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + FILES="$(dpkg -L "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" elif [ "$PACKET_HANDLER" = "rpm" ]; then - FILES="$(rpm -ql "$PACKAGE" | grep -v -E 'share/(doc|man)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" + FILES="$(rpm -ql "$PACKAGE" | grep "^/" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" fi # ugly hack to get our return value #local LPRET=$(echo "$FILES" | tail -1 | sed 's/^.*:###:\([0-9]*\)$/\1/g') |