projects
/
platform
/
framework
/
web
/
wrt-installer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed recovery widget during preinstallation
[platform/framework/web/wrt-installer.git]
/
etc
/
wrt_preinstall_widgets.sh
diff --git
a/etc/wrt_preinstall_widgets.sh
b/etc/wrt_preinstall_widgets.sh
index
218015d
..
61935a3
100755
(executable)
--- a/
etc/wrt_preinstall_widgets.sh
+++ b/
etc/wrt_preinstall_widgets.sh
@@
-15,7
+15,10
@@
#
_working_dir="/opt/usr/media/Downloads/.preinstallWidgets"
#
_working_dir="/opt/usr/media/Downloads/.preinstallWidgets"
-_widget_temp="/opt/share/widget/*";
+_widget_temp="/opt/share/widget/*"
+
+#Reinstall widget during booting
+_temp_widget_path="/opt/share/widget/temp_info"
install_widgets() {
_wgt_list=`find $_working_dir -name '*.wgt'`
install_widgets() {
_wgt_list=`find $_working_dir -name '*.wgt'`
@@
-47,10
+50,6
@@
for file in $_widget_temp; do
fi
done
fi
done
-
-#Reinstall widget during booting
-_temp_widget_path=/opt/share/widget/temp_info
-
FILE_LIST=`ls $_temp_widget_path`
if [ -n "$FILE_LIST" ]; then
FILE_LIST=`ls $_temp_widget_path`
if [ -n "$FILE_LIST" ]; then
@@
-60,9
+59,8
@@
if [ -n "$FILE_LIST" ]; then
line=`cat $FILE_NAME`
echo "----------------------------------------------------------------"
echo "UnInstalling widget : $line ..."
line=`cat $FILE_NAME`
echo "----------------------------------------------------------------"
echo "UnInstalling widget : $line ..."
- wrt-installer -up $line
- echo "Installing widget : $line ..."
- wrt-installer -i $line
+ return_string=`wrt-installer -up $line 2>&1 | grep -v plugin`
+ echo "Result $return_string"
done
else
echo "There is no reinstall widget."
done
else
echo "There is no reinstall widget."
@@
-72,10
+70,10
@@
fi
#Plugin installation is temporary code for window SDK
/usr/bin/wrt-installer -p
#Plugin installation is temporary code for window SDK
/usr/bin/wrt-installer -p
-if [ ! -d $_working_dir ]; then
- echo "There is no preinstall widget directory - $_working_dir"
+RECOVER_WIDGETS=`ls $_temp_widget_path`
+if [ -n "$RECOVER_WIDGETS" ]; then
+ echo "Start Recover"
restore_widget
restore_widget
- exit 1
fi
install_widgets
fi
install_widgets