diff options
| author | Jonathan Bauer | 2013-06-27 18:21:55 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-27 18:21:55 +0200 |
| commit | f0d2b69a3d596a72d0451c58d4e31b7603e017fb (patch) | |
| tree | 9f57bbe81a49ea81811072117153e3a38a9ebeac /remote/modules/openbox/openbox.build | |
| parent | [pam] krb5 support for home (diff) | |
| parent | [rootfs-stage32] do not copy /dev/fb0, handled by mdev (diff) | |
| download | tm-scripts-f0d2b69a3d596a72d0451c58d4e31b7603e017fb.tar.gz tm-scripts-f0d2b69a3d596a72d0451c58d4e31b7603e017fb.tar.xz tm-scripts-f0d2b69a3d596a72d0451c58d4e31b7603e017fb.zip | |
Merge branch 'master' of git:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/openbox/openbox.build')
| -rw-r--r-- | remote/modules/openbox/openbox.build | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build index f3ce1448..0cd6aaad 100644 --- a/remote/modules/openbox/openbox.build +++ b/remote/modules/openbox/openbox.build @@ -21,10 +21,16 @@ post_copy() { # pango-querymodules-64, not pango-querymodules. which pango-querymodules 2>/dev/null 1>&2 ERR=$? - if [[ "$ERR" -ne 0 ]]; then - PANGO_QUERYMODULES_ARCH=pango-querymodules-64 - else + if [[ "$ERR" -eq 0 ]]; then PANGO_QUERYMODULES_ARCH=pango-querymodules + else + which pango-querymodules-64 2>/dev/null 1>&2 + ERR=$? + if [[ "$ERR" -eq 0 ]]; then + PANGO_QUERYMODULES_ARCH=pango-querymodules-64 + else + perror "Could not find either pango-querymodules or pango-querymodules-64!" + fi fi $PANGO_QUERYMODULES_ARCH > "$TARGET_BUILD_DIR/etc/pango/pango.modules" } |