From 1e05cfa5b339a3a8c734018a237785e34aa53049 Mon Sep 17 00:00:00 2001 From: "gs86.lee" Date: Tue, 28 Jun 2016 17:30:52 +0900 Subject: [PATCH] Remove shell script Change-Id: I416d280483098c30e4e6154950056e494e4f6da4 --- CMakeLists.txt | 8 -------- packaging/starter-pre.service | 2 +- packaging/starter.spec | 18 +----------------- rd3starter | 14 -------------- rd4starter | 4 ---- starter | 15 --------------- 6 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 rd3starter delete mode 100644 rd4starter delete mode 100644 starter diff --git a/CMakeLists.txt b/CMakeLists.txt index 68ef92c..9b0b809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -291,12 +291,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) INSTALL(DIRECTORY DESTINATION ${DATADIR}) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/rd4starter DESTINATION /etc/init.d - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/rd3starter DESTINATION /etc/init.d - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -#INSTALL to /etc/init.d - ADD_SUBDIRECTORY(po) diff --git a/packaging/starter-pre.service b/packaging/starter-pre.service index ca286df..709e6aa 100644 --- a/packaging/starter-pre.service +++ b/packaging/starter-pre.service @@ -4,4 +4,4 @@ Description=Pre actions for "starter" [Service] EnvironmentFile=/run/tizen-system-env Type=oneshot -ExecStart=/etc/init.d/rd3starter +ExecStart=/usr/bin/starter diff --git a/packaging/starter.spec b/packaging/starter.spec index ed06e90..c130646 100644 --- a/packaging/starter.spec +++ b/packaging/starter.spec @@ -138,6 +138,7 @@ cmake . -DTIZEN_PROFILE_NAME=%{TIZEN_PROFILE_NAME} -DCMAKE_INSTALL_PREFIX=%{_pre make make -j1 + %install rm -rf %{buildroot} %make_install @@ -159,29 +160,13 @@ ln -s ../starter-pre.path %{buildroot}%{__usrdir}/default.target.wants/starter-p mkdir -p %{buildroot}/usr/share/license cp -f LICENSE %{buildroot}/usr/share/license/%{name} -mkdir -p %{buildroot}/opt/data/home-daemon %post -change_file_executable() -{ - chmod +x $@ 2>/dev/null - if [ $? -ne 0 ]; then - echo "Failed to change the perms of $@" - fi -} - -mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/ - -#ln -sf /etc/init.d/rd4starter /etc/rc.d/rc4.d/S81starter -#ln -sf /etc/init.d/rd4starter /etc/rc.d/rc3.d/S81starter - sync %files %manifest starter.manifest %defattr(-,root,root,-) -%{_sysconfdir}/init.d/rd4starter -%{_sysconfdir}/init.d/rd3starter %{_bindir}/starter %{__usrdir}/starter.service %{__usrdir}/starter.path @@ -192,5 +177,4 @@ sync %{__usrdir}/default.target.wants/starter-pre.service %{__usrdir}/default.target.wants/starter-pre.path /usr/share/license/%{name} -/opt/data/home-daemon /usr/share/locale/*/LC_MESSAGES/* diff --git a/rd3starter b/rd3starter deleted file mode 100644 index 8a87373..0000000 --- a/rd3starter +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# commented and this was moved to isf-panel-efl code -#while [ ! -f /tmp/.wm_ready ]; -#do -# sleep 0.1 -#done - -#while [ ! -f /run/amd_ready ]; -#do -# /bin/sleep 0.1 -#done - -exit 0 diff --git a/rd4starter b/rd4starter deleted file mode 100644 index d01dc08..0000000 --- a/rd4starter +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo -e "<2>[${_G}menu-daemon start${C_}]" > /dev/kmsg -/usr/bin/starter & diff --git a/starter b/starter deleted file mode 100644 index 03d278c..0000000 --- a/starter +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -CURRENT_RUNLEVEL=`basename $PWD` -# CURRENT_RUNLEVEL could be "rc3.d" or "rc4.d" - -if [ x"$CURRENT_RUNLEVEL" == x"rc3.d" ]; then - while [ ! -f /tmp/.wm_ready ]; - do - /bin/sleep 0.1 - done -fi - -/usr/bin/starter & - - -- 2.7.4