From: Rusty Lynch Date: Sat, 25 May 2013 22:42:20 +0000 (-0700) Subject: Remove defunct init scripts X-Git-Tag: accepted/tizen/20130603.173548~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f710c2b54a29ff88a669e7bc2a69589dce540ba9;p=platform%2Fframework%2Fweb%2Fwrt-installer.git Remove defunct init scripts --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b3933c5..b2262e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,6 @@ SET(TARGET_BACKEND_LIB "wgt") ############################# subdirectories ################################## ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(etc) IF(WITH_TESTS) ADD_SUBDIRECTORY(tests) diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt deleted file mode 100644 index 370d4af..0000000 --- a/etc/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -SET(ETC_DIR ${PROJECT_SOURCE_DIR}/etc) - -INSTALL(PROGRAMS ${ETC_DIR}/wrt_preinstall_widgets.sh DESTINATION /etc/rc.d/init.d) diff --git a/etc/DESCRIPTION b/etc/DESCRIPTION deleted file mode 100644 index bf6eac9..0000000 --- a/etc/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -This directory contain confiration scripts, config files, certificates and all other data that don't fit to other directories. diff --git a/etc/wrt_preinstall_widgets.sh b/etc/wrt_preinstall_widgets.sh deleted file mode 100755 index 996d6a3..0000000 --- a/etc/wrt_preinstall_widgets.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -_working_dir="/opt/usr/media/Downloads/.preinstallWidgets" -_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_failed=0 - for list in $_wgt_list - do - echo "Install $list" - return_string=`wrt-installer -i $list 2>&1 | grep -v plugin` - if [ "$return_string" != "${return_string/successful/}" ]; then - echo "$list widget installation success" - rm -rf $list - else - echo "$list widget installaiton failed" - install_failed=1 - fi - done - - if [ $install_failed -ne 1 ];then - echo "preinstall success" - rm -rf $_working_dir - fi -} - -restore_widget() { -#Remove temporary directory during widget installation -for file in $_widget_temp; do - if [[ -d $file && ${file#*temp_[0-9]*} != $file ]]; then - rm -rf $file - fi -done - -FILE_LIST=`ls $_temp_widget_path` - -if [ -n "$FILE_LIST" ]; then - echo "There are widgets to need reinstall." - for widget in $FILE_LIST; do - FILE_NAME=$_temp_widget_path/$widget - line=`cat $FILE_NAME` - echo "----------------------------------------------------------------" - echo "UnInstalling widget : $line ..." - return_string=`wrt-installer -up $line 2>&1 | grep -v plugin` - echo "Result $return_string" - done -else - echo "There is no reinstall widget." -fi -} - -#Plugin installation is temporary code for window SDK -/usr/bin/wrt-installer -p - -RECOVER_WIDGETS=`ls $_temp_widget_path` -if [ -n "$RECOVER_WIDGETS" ]; then - echo "Start Recover" - restore_widget -fi - -install_widgets diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec index 23a2f39..9d0ecba 100644 --- a/packaging/wrt-installer.spec +++ b/packaging/wrt-installer.spec @@ -1,4 +1,3 @@ -#git:framework/web/wrt-installer wrt-installer_0.1.58.2 Name: wrt-installer Summary: Installer for tizen Webruntime Version: 0.1.58.2 @@ -81,10 +80,6 @@ install -m 644 %{SOURCE100} %{buildroot}%{_libdir}/systemd/user mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-mobile-session.target.wants ln -s ../wrt-preinstall-widgets.service %{buildroot}%{_libdir}/systemd/user/tizen-mobile-session.target.wants -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/ -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/ -ln -s ../init.d/wrt_preinstall_widgets.sh %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S48lwrt_preinstall_widgets.sh -ln -s ../init.d/wrt_preinstall_widgets.sh %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S48lwrt_preinstall_widgets.sh %clean rm -rf %{buildroot} @@ -98,10 +93,6 @@ ln -sf /usr/bin/wrt-installer /usr/etc/package-manager/backend/wgt #for booting recovery mkdir -p /opt/share/widget/temp_info -[ -h /etc/rc.d/rc3.d/S48lwrt_preinstall_widgets.sh ] && rm /etc/rc.d/rc3.d/S48lwrt_preinstall_widgets.sh -[ -h /etc/rc.d/rc5.d/S48lwrt_preinstall_widgets.sh ] && rm /etc/rc.d/rc5.d/S48lwrt_preinstall_widgets.sh -ln -s /etc/rc.d/init.d/wrt_preinstall_widgets.sh /etc/rc.d/rc3.d/S48lwrt_preinstall_widgets.sh -ln -s /etc/rc.d/init.d/wrt_preinstall_widgets.sh /etc/rc.d/rc5.d/S48lwrt_preinstall_widgets.sh # for downloadable Application icons path mkdir -p /opt/share/icons/default/small @@ -111,9 +102,6 @@ mkdir -p /opt/share/icons/default/small %files %manifest wrt-installer.manifest %attr(755,root,root) %{_bindir}/wrt-installer -%attr(775,root,root) %{_initddir}/wrt_preinstall_widgets.sh -%{_sysconfdir}/rc.d/rc3.d/S48lwrt_preinstall_widgets.sh -%{_sysconfdir}/rc.d/rc5.d/S48lwrt_preinstall_widgets.sh /usr/etc/package-manager/backendlib/libwgt.so %{_datadir}/license/%{name} %{_libdir}/systemd/user/tizen-mobile-session.target.wants/wrt-preinstall-widgets.service