From 9d2a85bcd9d96d0a67f7ca4093c284be7dd66115 Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Fri, 12 Oct 2012 17:04:37 +0900 Subject: [PATCH] Revert "Fixed preinstall widget wasn't installed after factory reset" This reverts commit 1356504a38a8866d00b299abe11f9887322089b4. --- debian/wrt-installer.postinst | 2 +- etc/wrt_preinstall_widgets.sh | 4 ++-- packaging/wrt-installer.spec | 2 +- src/jobs/widget_install/task_commons.cpp | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/wrt-installer.postinst b/debian/wrt-installer.postinst index ce2fd36..c72a8b2 100755 --- a/debian/wrt-installer.postinst +++ b/debian/wrt-installer.postinst @@ -6,7 +6,7 @@ chmod +s /usr/bin/wrt-installer ln -sf /usr/bin/wrt-installer /usr/etc/package-manager/backend/wgt #for recovery -mkdir -p /opt/share/widget/temp_info +mkdir -p /opt/apps/widget/temp_info ln -s /etc/rc.d/init.d/wrt_preinstall_widgets.sh /etc/rc.d/rc3.d/S46lwrt_preinstall_widgets.sh ln -s /etc/rc.d/init.d/wrt_preinstall_widgets.sh /etc/rc.d/rc5.d/S46lwrt_preinstall_widgets.sh diff --git a/etc/wrt_preinstall_widgets.sh b/etc/wrt_preinstall_widgets.sh index b639ae5..3732590 100755 --- a/etc/wrt_preinstall_widgets.sh +++ b/etc/wrt_preinstall_widgets.sh @@ -15,7 +15,7 @@ # _working_dir="/opt/media/Downloads/.preinstallWidgets" -_widget_temp="/opt/share/widget/*"; +_widget_temp="/opt/apps/widget/*"; install_widgets() { _wgt_list=`find $_working_dir -name '*.wgt'` @@ -38,7 +38,7 @@ done #Reinstall widget during booting -_temp_widget_path=/opt/share/widget/temp_info +_temp_widget_path=/opt/apps/widget/temp_info FILE_LIST=`ls $_temp_widget_path` diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec index 85ea053..653c2de 100644 --- a/packaging/wrt-installer.spec +++ b/packaging/wrt-installer.spec @@ -67,7 +67,7 @@ chmod +s /usr/bin/wrt-installer ln -sf /usr/bin/wrt-installer /usr/etc/package-manager/backend/wgt #for booting recovery -mkdir -p /opt/share/widget/temp_info +mkdir -p /opt/apps/widget/temp_info [ -h /etc/rc.d/rc3.d/S46lwrt_preinstall_widgets.sh ] && rm /etc/rc.d/rc3.d/S46lwrt_preinstall_widgets.sh [ -h /etc/rc.d/rc5.d/S46lwrt_preinstall_widgets.sh ] && rm /etc/rc.d/rc5.d/S46lwrt_preinstall_widgets.sh ln -s /etc/rc.d/init.d/wrt_preinstall_widgets.sh /etc/rc.d/rc3.d/S46lwrt_preinstall_widgets.sh diff --git a/src/jobs/widget_install/task_commons.cpp b/src/jobs/widget_install/task_commons.cpp index 983a68f..b64e61b 100644 --- a/src/jobs/widget_install/task_commons.cpp +++ b/src/jobs/widget_install/task_commons.cpp @@ -82,6 +82,8 @@ std::string createTempPath() tempPathBuilder << WrtDB::GlobalConfig::GetUserInstalledWidgetPath(); tempPathBuilder << "/"; + tempPathBuilder << "widget"; + tempPathBuilder << "/"; tempPathBuilder << TEMPORARY_PATH_POSTFIX; tempPathBuilder << "_"; -- 2.7.4