installer.kmdr: support x86_64 lib directory when checking for kcm clock and language applets

This commit is contained in:
Silvan Calarco 2013-02-06 16:20:12 +01:00
parent 771ce7d2e0
commit 2a75e59cf8

View File

@ -819,7 +819,7 @@ dcop @dcopid KommanderIf setText licenseBrowser "`cat /usr/share/openmamba/insta
<string>@execBegin <string>@execBegin
currdate=`date +"%x %H:%M %Z"` currdate=`date +"%x %H:%M %Z"`
dcop @dcopid KommanderIf setText timelabel "$currdate" dcop @dcopid KommanderIf setText timelabel "$currdate"
[ -e /opt/kde/lib/kde4/kcm_clock.so ] || dcop @dcopid KommanderIf setEnabled timebutton "false" [ -e /opt/kde/lib/kde4/kcm_clock.so -o -e /opt/kde/lib64/kde4/kcm_clock.so ] || dcop @dcopid KommanderIf setEnabled timebutton "false"
@execEnd @execEnd
</string> </string>
</stringlist> </stringlist>
@ -1006,7 +1006,7 @@ case ${LANGUAGE:0:5} in
esac esac
dcop @dcopid KommanderIf setText langlabel "$LANGUAGE" dcop @dcopid KommanderIf setText langlabel "$LANGUAGE"
dcop @dcopid KommanderIf setText countrylabel $"$COUNTRY" dcop @dcopid KommanderIf setText countrylabel $"$COUNTRY"
[ -e /opt/kde/lib/kde4/kcm_locale.so ] || dcop @dcopid KommanderIf setEnabled langbutton "false"</string> [ -e /opt/kde/lib/kde4/kcm_locale.so -o -e /opt/kde/lib64/kde4/kcm_locale.so ] || dcop @dcopid KommanderIf setEnabled langbutton "false"</string>
</stringlist> </stringlist>
</property> </property>
</widget> </widget>