Merge addition #1 (#2)

* Added #1 Signed-off-by: ojullien <ojullien@users.noreply.github.com> * v3.3.0 Signed-off-by: ojullien <ojullien@users.noreply.github.com>
ojullien · Feb 13, 2020 · a447232 · a447232
1 parent c9d8e11
commit a447232
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/src/app/updatesystem/VERSION b/src/app/updatesystem/VERSION
@@ -1,2 +1 @@
-v3.2
-20190701
+v3.3.0-20200213
diff --git a/src/bin/updatesystem.sh b/src/bin/updatesystem.sh
@@ -36,9 +36,6 @@ readonly m_DIR_REALPATH="$(realpath "$(dirname "$0")")"
 . "${m_DIR_SYS}/config.sh"
 # shellcheck source=/dev/null
 . "${m_DIR_SYS}/package.sh"
-# shellcheck source=/dev/null
-. "${m_DIR_SYS}/service.sh"
-Config::load "manageservices"
 Config::load "updatesystem"
 # shellcheck source=/dev/null
 . "${m_DIR_APP}/updatesystem/app.sh"
@@ -52,7 +49,6 @@ Config::load "updatesystem"
 ## Trace
 ## -----------------------------------------------------------------------------
 Constant::trace
-ManageServices::trace
 UpdateSystem::trace
 
 ## -----------------------------------------------------------------------------
@@ -63,15 +59,6 @@ String::notice "Today is: $(date -R)"
 String::notice "The PID for $(basename "$0") process is: $$"
 Console::waitUser
 
-## -----------------------------------------------------------------------------
-## Disable & stop services
-## -----------------------------------------------------------------------------
-String::separateLine
-Service::disableServices ${m_SERVICES_DISABLE}
-String::separateLine
-Service::stopServices ${m_SERVICES_STOP}
-Console::waitUser
-
 ## -----------------------------------------------------------------------------
 ## Update and upgrade
 ## -----------------------------------------------------------------------------
@@ -118,16 +105,6 @@ String::separateLine
 UpdateSystem::updateDB
 Console::waitUser
 
-## -----------------------------------------------------------------------------
-## Start services
-## -----------------------------------------------------------------------------
-UpdateSystem::finish() {
-    String::separateLine
-    Service::startServices ${m_SERVICES_START}
-    String::notice "Now is: $(date -R)"
-}
-trap UpdateSystem::finish EXIT SIGQUIT SIGTERM SIGINT ERR
-
 ## -----------------------------------------------------------------------------
 ## END
 ## -----------------------------------------------------------------------------