summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaromil <jaromil@129b00e9-8bf7-0310-bee9-bd51b64996e4>2007-11-04 21:16:25 (GMT)
committer jaromil <jaromil@129b00e9-8bf7-0310-bee9-bd51b64996e4>2007-11-04 21:16:25 (GMT)
commit9c12e220aef03f9840d4f69ffe37fae409119cfd (patch)
treeb85b55ee46710fd95e5c4960ea0645480f7b1c91
parent2f7cd3cd33ed66d30d859c8c4db96f0e089c43ef (diff)
exposing applist in the dock for translation
git-svn-id: svn://dyne.org/dynebolic@259 129b00e9-8bf7-0310-bee9-bd51b64996e4
-rw-r--r--dyneII/startup/lib/bootstrap.sh4
-rw-r--r--dyneII/startup/lib/wmaker.sh9
2 files changed, 10 insertions, 3 deletions
diff --git a/dyneII/startup/lib/bootstrap.sh b/dyneII/startup/lib/bootstrap.sh
index 540c3ae..51d6e22 100644
--- a/dyneII/startup/lib/bootstrap.sh
+++ b/dyneII/startup/lib/bootstrap.sh
@@ -418,9 +418,9 @@ append_line /boot/dynenv "export DYNE_SYS_DEV=${DYNE_SYS_DEV}"
append_line /boot/dynenv "export DYNE_SYS_MEDIA=${DYNE_SYS_MEDIA}"
append_line /boot/dynenv "export DYNE_SYS_MNT=${DYNE_SYS_MNT}"
-# create a useful link to the dock
+# create useful links to the dock
ln -s ${DYNE_SYS_MNT} /lib/dyne/configure/Dyne
-
+ln -s ${DYNE_SYS_MNT} /mnt/dyne
}
##########################################
diff --git a/dyneII/startup/lib/wmaker.sh b/dyneII/startup/lib/wmaker.sh
index 1e055db..12b148c 100644
--- a/dyneII/startup/lib/wmaker.sh
+++ b/dyneII/startup/lib/wmaker.sh
@@ -82,6 +82,8 @@ check_apps_present() {
source /lib/dyne/zsh/common
# load dyne modules paths
source /boot/dynenv.modules
+ # load dyne env
+ source /boot/dynenv
if [ $1 ]; then
APPS=$1
@@ -98,7 +100,12 @@ check_apps_present() {
echo "# automatically generated at boot" >> /boot/dyne.apps
echo >> $APPS
- LINE=`cat /lib/dyne/dyne.applist`
+ if [ -r $DYNE_SYS_MNT/applist ]; then
+ # read the applist in the dock
+ LINE=`cat $DYNE_SYS_MNT/applist`
+ else
+ LINE=`cat /lib/dyne/dyne.applist`
+ fi
for l in ${(f)LINE}; do
check_app_entry $l $APPS
done