|
 |
6a9a27 |
diff -up bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh.cond_install bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh
|
|
|
6a9a27 |
--- bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh.cond_install 2009-07-29 11:38:48.000000000 +0200
|
|
|
6a9a27 |
+++ bltk-1.0.9/wl_developer/bltk_wl_developer_install.sh 2009-07-29 14:54:40.878602487 +0200
|
|
|
6a9a27 |
@@ -38,6 +38,8 @@
|
|
|
6a9a27 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
6a9a27 |
#
|
|
|
6a9a27 |
|
|
|
6a9a27 |
+[ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
|
|
|
6a9a27 |
+
|
|
|
6a9a27 |
source `dirname $0`/../../bin/bltk_wl_common
|
|
|
6a9a27 |
[[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
|
|
|
6a9a27 |
|
|
|
6a9a27 |
@@ -139,9 +141,14 @@ else
|
|
|
6a9a27 |
exit 1
|
|
|
6a9a27 |
fi
|
|
|
6a9a27 |
|
|
|
6a9a27 |
-{
|
|
|
6a9a27 |
-startup
|
|
|
6a9a27 |
-$work
|
|
|
6a9a27 |
-cleanup 0
|
|
|
6a9a27 |
-} 2>&1 | tee -i $work.log
|
|
|
6a9a27 |
+if [[ "$WL_DEVELOPER_ENABLED" = "YES" && "$WL_DEVELOPER_EXTERN" = "YES" ]]
|
|
|
6a9a27 |
+then
|
|
|
6a9a27 |
+ {
|
|
|
6a9a27 |
+ startup
|
|
|
6a9a27 |
+ $work
|
|
|
6a9a27 |
+ cleanup 0
|
|
|
6a9a27 |
+ } 2>&1 | tee -i $work.log
|
|
|
6a9a27 |
+else
|
|
|
6a9a27 |
+ exit 0
|
|
|
6a9a27 |
+fi
|
|
|
6a9a27 |
|
|
|
6a9a27 |
diff -up bltk-1.0.9/wl_office/bltk_wl_office_install.sh.cond_install bltk-1.0.9/wl_office/bltk_wl_office_install.sh
|
|
|
6a9a27 |
--- bltk-1.0.9/wl_office/bltk_wl_office_install.sh.cond_install 2009-07-29 11:38:48.000000000 +0200
|
|
|
6a9a27 |
+++ bltk-1.0.9/wl_office/bltk_wl_office_install.sh 2009-07-29 15:00:59.406496688 +0200
|
|
|
6a9a27 |
@@ -38,6 +38,8 @@
|
|
|
6a9a27 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
6a9a27 |
#
|
|
|
6a9a27 |
|
|
|
6a9a27 |
+[ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
|
|
|
6a9a27 |
+
|
|
|
6a9a27 |
source `dirname $0`/../../bin/bltk_wl_common
|
|
|
6a9a27 |
[[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
|
|
|
6a9a27 |
|
|
|
6a9a27 |
@@ -80,7 +81,6 @@ cleanup()
|
|
|
6a9a27 |
|
|
|
6a9a27 |
install_ooo()
|
|
|
6a9a27 |
{
|
|
|
6a9a27 |
-
|
|
|
6a9a27 |
wl_remove_file ${HOME}/.sversionrc
|
|
|
6a9a27 |
wl_check_error $?
|
|
|
6a9a27 |
|
|
|
6a9a27 |
@@ -188,23 +188,27 @@
|
|
|
6a9a27 |
|
|
|
6a9a27 |
}
|
|
|
6a9a27 |
|
|
|
6a9a27 |
-if [[ $# = 0 || $1 = i || $1 = install ]]
|
|
|
6a9a27 |
+if [[ "$WL_OFFICE_ENABLED" = "YES" && "$WL_OFFICE_EXTERN" = "YES" ]]
|
|
|
6a9a27 |
then
|
|
|
6a9a27 |
- work=install
|
|
|
6a9a27 |
-elif [[ $1 = install-loc ]]
|
|
|
6a9a27 |
-then
|
|
|
6a9a27 |
- work=install-loc
|
|
|
6a9a27 |
-elif [[ $1 = u || $1 = uninstall ]]
|
|
|
6a9a27 |
-then
|
|
|
6a9a27 |
- work=uninstall
|
|
|
6a9a27 |
+ if [[ $# = 0 || $1 = i || $1 = install ]]
|
|
|
6a9a27 |
+ then
|
|
|
6a9a27 |
+ work=install
|
|
|
6a9a27 |
+ elif [[ $1 = install-loc ]]
|
|
|
6a9a27 |
+ then
|
|
|
6a9a27 |
+ work=install-loc
|
|
|
6a9a27 |
+ elif [[ $1 = u || $1 = uninstall ]]
|
|
|
6a9a27 |
+ then
|
|
|
6a9a27 |
+ work=uninstall
|
|
|
6a9a27 |
+ else
|
|
|
6a9a27 |
+ echo "Invalid parameter"
|
|
|
6a9a27 |
+ exit 1
|
|
|
6a9a27 |
+ fi
|
|
|
6a9a27 |
+
|
|
|
6a9a27 |
+ {
|
|
|
6a9a27 |
+ startup
|
|
|
6a9a27 |
+ $work
|
|
|
6a9a27 |
+ cleanup 0
|
|
|
6a9a27 |
+ } 2>&1 | tee -i $work.log
|
|
|
6a9a27 |
else
|
|
|
6a9a27 |
- echo "Invalid parameter"
|
|
|
6a9a27 |
- exit 1
|
|
|
6a9a27 |
+ exit 0
|
|
|
6a9a27 |
fi
|
|
|
6a9a27 |
-
|
|
|
6a9a27 |
-{
|
|
|
6a9a27 |
-startup
|
|
|
6a9a27 |
-$work
|
|
|
6a9a27 |
-cleanup 0
|
|
|
6a9a27 |
-} 2>&1 | tee -i $work.log
|
|
|
6a9a27 |
-
|
|
|
6a9a27 |
--- bltk-1.0.9/wl_player/bltk_wl_player_install.sh.cond_install 2009-07-29 11:38:48.000000000 +0200
|
|
|
6a9a27 |
+++ bltk-1.0.9/wl_player/bltk_wl_player_install.sh 2009-07-29 15:06:43.249585854 +0200
|
|
|
6a9a27 |
@@ -41,6 +41,8 @@
|
|
|
6a9a27 |
|
|
|
6a9a27 |
PLAYER_INSTALL_FLAGS=" --disable-ivtv"
|
|
|
6a9a27 |
|
|
|
6a9a27 |
+[ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
|
|
|
6a9a27 |
+
|
|
|
6a9a27 |
source `dirname $0`/../../bin/bltk_wl_common
|
|
|
6a9a27 |
[[ $? != 0 ]] && { echo "bltk tree corrupted"; exit 2; }
|
|
|
6a9a27 |
|
|
|
6a9a27 |
@@ -286,17 +288,21 @@ else
|
|
|
6a9a27 |
exit 1
|
|
|
6a9a27 |
fi
|
|
|
6a9a27 |
|
|
|
6a9a27 |
+if [[ "$WL_PLAYER_ENABLED" = "YES" && "$WL_PLAYER_EXTERN" = "YES" ]]
|
|
|
6a9a27 |
+then
|
|
|
6a9a27 |
{
|
|
|
6a9a27 |
-
|
|
|
6a9a27 |
#If there is a ENV variable named CFLAGS, the CFLAGS value in wl_player/Makefile
|
|
|
6a9a27 |
#will be set to this ENV variable. Since the MPlayer will inherit the ENV CFLAGS
|
|
|
6a9a27 |
#value, the compiling will failed for "-pedantic -std=c99" in CFLAGS. So we need
|
|
|
6a9a27 |
#to unset the variable here.
|
|
|
6a9a27 |
|
|
|
6a9a27 |
-CFLAGS=
|
|
|
6a9a27 |
-LDFLAGS=
|
|
|
6a9a27 |
-startup
|
|
|
6a9a27 |
-$work
|
|
|
6a9a27 |
-cleanup 0
|
|
|
6a9a27 |
-} 2>&1 | tee -i $work.log
|
|
|
6a9a27 |
-
|
|
|
6a9a27 |
+ CFLAGS=
|
|
|
6a9a27 |
+ LDFLAGS=
|
|
|
6a9a27 |
+ startup
|
|
|
6a9a27 |
+ $work
|
|
|
6a9a27 |
+ cleanup 0
|
|
|
6a9a27 |
+ } 2>&1 | tee -i $work.log
|
|
|
6a9a27 |
+}
|
|
|
6a9a27 |
+else
|
|
|
6a9a27 |
+ exit 0
|
|
|
6a9a27 |
+fi
|