Browse Source

HPCC-8528 Modify the code after pull request comments

Modify symbolic link list: add ecl-bundle and remove satrt-stop-daemon
Modify clienttools/install/CMakeLists.txt
Xiaoming Wang 11 years ago
parent
commit
7bbdacc3af
2 changed files with 8 additions and 6 deletions
  1. 4 2
      clienttools/install/CMakeLists.txt
  2. 4 4
      clienttools/install/post_install.sh

+ 4 - 2
clienttools/install/CMakeLists.txt

@@ -1,7 +1,9 @@
-if (UNIX)
+if (APPLE)
+   # If APPLE requires the same scripts  if/elseif  will be removed
+elseif (UNIX)
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/postinst.in" "postinst" )
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/prerm.in" "prerm" )
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/postrm.in" "postrm" )
-endif(UNIX)
+endif(APPLE)
 
 install ( PROGRAMS post_install.sh DESTINATION etc/init.d/install COMPONENT Runtime )

+ 4 - 4
clienttools/install/post_install.sh

@@ -30,14 +30,14 @@ files_to_link=(
    'ecl-queries'
    'ecl-roxie'
    'soapplus'
-   'start-stop-daemon'
    'wuget'
+   'ecl-bundle'
 )
 
 # Check if this is post uninstall
 #################################
-IS_UNINSTAL=0
-[ "$1" = "-u" ] && IS_UNINSTAL=1
+IS_UNINSTALL=0
+[ "$1" = "-u" ] && IS_UNINSTALL=1
 
 
 
@@ -55,7 +55,7 @@ cd $CUR_DIR
 ################################################
 [ -e /opt/HPCCSystems/etc/init.d/hpcc-init ] && exit 0
 
-if [ $IS_UNINSTAL -eq 0 ]
+if [ $IS_UNINSTALL -eq 0 ]
 then
     # Add symbolic link
     for file in ${files_to_link[@]}