diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-05-22 09:04:40 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-05-30 12:36:52 +0200 |
| commit | b7988de7c0dcb6aad00864dd07d8be61021ac8d2 (patch) | |
| tree | 0a4ed3ab6308b4dd97ec5f480cc5acf7a024e5b3 | |
| parent | 04161ae40d9ba7fddbdaed183ebadceb8c784ad9 (diff) | |
tdf#105204 fix iteration over profile
regression of
commit 7bec7abd4c3d78e6a37f523f4fb599134ef51ca7
tdf#105204: ShellCheck nitpicks for apparmor.sh
Change-Id: I5086e2a3af2908fe051c0bdc91753533adf7bafd
Reviewed-on: https://gerrit.libreoffice.org/37896
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
| -rwxr-xr-x | sysui/desktop/share/apparmor.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysui/desktop/share/apparmor.sh b/sysui/desktop/share/apparmor.sh index cf554257cf72..253fe87cf78d 100755 --- a/sysui/desktop/share/apparmor.sh +++ b/sysui/desktop/share/apparmor.sh @@ -37,11 +37,11 @@ INST_ROOT_FORMAT=${INST_ROOT_FORMAT////.} #Need to escape / for sed INST_ROOT_SED=${INST_ROOT////\\/} -for filename in $PROFILESFROM +for filename in $PROFILESFROM/* do - tourl=$INSTALLTO$INST_ROOT_FORMAT$filename - sed "s/INSTDIR-/$INST_ROOT_SED/g" "$PROFILESFROM""$filename" > "$tourl" - [[ -e $filename ]] || break + [[ -e $filename ]] || { echo "No profile files found in ""$PROFILESFROM"; exit 1; } + tourl=$INSTALLTO$INST_ROOT_FORMAT${filename##*/} + sed "s/INSTDIR-/$INST_ROOT_SED/g" "$filename" > "$tourl" echo "$tourl" done |