[REFACTOR] move scripts to /usr/bin

Add prefix "swap_" to all scripts
Move scripts to /usr/bin
Add full paths to modules in start script

Change-Id: I50c4f487c780dec6d2fc5c43dca851c7c042fe97
Signed-off-by: Dmitry Kovalenko <d.kovalenko@samsung.com>

diff --git a/daemon/Makefile b/daemon/Makefile
index 9bd6b35..ba5ef98 100644 (file)
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -127,10 +127,10 @@ SRC_CPP := \
 
 TARGET = da_manager
 DASCRIPT = da_command
-START_SH = ../scripts/start.sh
-STOP_SH = ../scripts/stop.sh
-INIT_PRELOAD_SH = ../scripts/init_preload.sh
-INIT_WSP_SH = ../scripts/init_wsp.sh
+START_SH = ../scripts/swap_start.sh
+STOP_SH = ../scripts/swap_stop.sh
+INIT_PRELOAD_SH = ../scripts/swap_init_preload.sh
+INIT_WSP_SH = ../scripts/swap_init_wsp.sh
 PRELOAD_SCRIPT = ../scripts/gen_preload_header.sh
 SCRIPTS := \
        $(START_SH) \
@@ -207,12 +207,10 @@ debug: rmheaders headers $(SCRIPTS) $(OBJS)
 
 
 install: BINDIR = $(DESTDIR)/usr/bin
-install: OPTDIR = $(DESTDIR)/opt/swap/sdk
 install: $(TARGET) $(SCRIPTS)
        mkdir -p $(BINDIR)
-       mkdir -p $(OPTDIR)
        install $(TARGET) -t $(BINDIR)
-       install -m 755 $(SCRIPTS) -t $(OPTDIR)
+       install -m 755 $(SCRIPTS) -t $(BINDIR)
 
 clean:
        rm -f $(TARGET) $(OBJS)

diff --git a/daemon/buffer.c b/daemon/buffer.c
index 52176a0..861b446 100644 (file)
--- a/daemon/buffer.c
+++ b/daemon/buffer.c
@@ -105,18 +105,18 @@ static int insert_buf_modules(void)
        FILE *f = NULL;
        char cmd[PATH_MAX];
 
-       res = system("cd /opt/swap/sdk && ./start.sh");
+       res = system("cd /usr/bin && ./swap_start.sh");
        if (res != 0) {
                LOGE("Cannot insert swap modules. code <%d>\n", res);
                /* decode error code */
-               snprintf(cmd, sizeof(cmd), "/opt/swap/sdk/start.sh %d", res);
+               snprintf(cmd, sizeof(cmd), "/usr/bin/swap_start.sh %d", res);
                f = popen(cmd, "r");
                if (f) {
                        while (NULL != fgets(cmd, sizeof(cmd), f))
-                               LOGE("start.sh >%s\n", cmd);
+                               LOGE("swap_start.sh >%s\n", cmd);
                        pclose(f);
                } else {
-                       LOGE("Cannot open start.sh\n");
+                       LOGE("Cannot open swap_start.sh\n");
                }
                return -1;
        }

diff --git a/daemon/main.c b/daemon/main.c
index 36aff8a..c8b6a2f 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -353,7 +353,7 @@ static int finalizeManager()
 static void remove_buf_modules(void)
 {
        LOGI("rmmod buffer start\n");
-       if (system("cd /opt/swap/sdk && ./stop.sh")) {
+       if (system("cd /usr/bin && ./swap_stop.sh")) {
                LOGW("Cannot remove swap modules\n");
        }
        LOGI("rmmod buffer done\n");

diff --git a/packaging/swap-manager.spec b/packaging/swap-manager.spec
index 909c299..7221946 100644 (file)
--- a/packaging/swap-manager.spec
+++ b/packaging/swap-manager.spec
@@ -101,10 +101,10 @@ touch /opt/usr/etc/resourced_proc_exclude.ini
 %manifest swap-manager.manifest
 %defattr(-,root,root,-)
 %{_prefix}/bin/da_manager
-/opt/swap/sdk/start.sh
-/opt/swap/sdk/stop.sh
-/opt/swap/sdk/init_preload.sh
-/opt/swap/sdk/init_wsp.sh
+/usr/bin/swap_start.sh
+/usr/bin/swap_stop.sh
+/usr/bin/swap_init_preload.sh
+/usr/bin/swap_init_wsp.sh
 
 %changelog
 

diff --git a/scripts/start.sh b/scripts/swap_start.sh
similarity index 60%
rename from scripts/start.sh
rename to scripts/swap_start.sh
index e511d8c..12f8ee8 100755 (executable)
--- a/scripts/start.sh
+++ b/scripts/swap_start.sh
@@ -25,25 +25,25 @@ fi
 
 if [ ! -e /sys/kernel/debug/swap/enable ]; then
 
-    /usr/sbin/insmod swap_master.ko           || exit 101
-    /usr/sbin/insmod swap_buffer.ko           || exit 102  # buffer is loaded
-    /usr/sbin/insmod swap_ksyms.ko            || exit 103
-    /usr/sbin/insmod swap_driver.ko           || exit 104  # driver is loaded
-    /usr/sbin/insmod swap_writer.ko           || exit 105
-    /usr/sbin/insmod swap_kprobe.ko           || exit 106  # kprobe is loaded
-    /usr/sbin/insmod swap_uprobe.ko           || exit 107  # uprobe is loaded
-    /usr/sbin/insmod swap_taskctx.ko          || exit 200
-    /usr/sbin/insmod swap_us_manager.ko       || exit 108  # us_manager is loaded
-    /usr/sbin/insmod swap_ks_features.ko      || exit 109  # ks_features is loaded
-    /usr/sbin/insmod swap_sampler.ko          || exit 110
-    /usr/sbin/insmod swap_energy.ko           || exit 111
-    /usr/sbin/insmod swap_message_parser.ko   || exit 112  # parser is loaded
-    /usr/sbin/insmod swap_retprobe.ko         || exit 113  # retprobe is loaded
-    /usr/sbin/insmod swap_fbiprobe.ko         || exit 114  # fbi is loaded
-    /usr/sbin/insmod swap_webprobe.ko         || exit 115  # webprobe is loaded
-    /usr/sbin/insmod swap_preload.ko          || exit 117
-    /usr/sbin/insmod swap_wsp.ko              || exit 118
-    /usr/sbin/insmod swap_nsp.ko              || exit 119
+    /usr/sbin/insmod /opt/swap/sdk/swap_master.ko           || exit 101
+    /usr/sbin/insmod /opt/swap/sdk/swap_buffer.ko           || exit 102  # buffer is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_ksyms.ko            || exit 103
+    /usr/sbin/insmod /opt/swap/sdk/swap_driver.ko           || exit 104  # driver is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_writer.ko           || exit 105
+    /usr/sbin/insmod /opt/swap/sdk/swap_kprobe.ko           || exit 106  # kprobe is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_uprobe.ko           || exit 107  # uprobe is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_taskctx.ko          || exit 200
+    /usr/sbin/insmod /opt/swap/sdk/swap_us_manager.ko       || exit 108  # us_manager is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_ks_features.ko      || exit 109  # ks_features is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_sampler.ko          || exit 110
+    /usr/sbin/insmod /opt/swap/sdk/swap_energy.ko           || exit 111
+    /usr/sbin/insmod /opt/swap/sdk/swap_message_parser.ko   || exit 112  # parser is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_retprobe.ko         || exit 113  # retprobe is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_fbiprobe.ko         || exit 114  # fbi is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_webprobe.ko         || exit 115  # webprobe is loaded
+    /usr/sbin/insmod /opt/swap/sdk/swap_preload.ko          || exit 117
+    /usr/sbin/insmod /opt/swap/sdk/swap_wsp.ko              || exit 118
+    /usr/sbin/insmod /opt/swap/sdk/swap_nsp.ko              || exit 119
 
 fi
 
@@ -97,13 +97,13 @@ fi
 #Preload
 if [ -d /sys/kernel/debug/swap/preload/ ]
 then
-       ./init_preload.sh
+       /usr/bin/swap_init_preload.sh
 fi
 
 #WSP
 if [ -d /sys/kernel/debug/swap/wsp/ ]
 then
-       ./init_wsp.sh
+       /usr/bin/swap_init_wsp.sh
 fi
 
 exit $ERR_NO

diff --git a/scripts/stop.sh b/scripts/swap_stop.sh
similarity index 100%
rename from scripts/stop.sh
rename to scripts/swap_stop.sh