@@ -2264,11 +2264,12 @@ function python_version {

 # Service wrapper to restart services

 # restart_service service-name

 function restart_service {

-    if is_ubuntu; then

-        sudo /usr/sbin/service $1 restart

+    if [ -x /bin/systemctl ]; then

+        sudo /bin/systemctl restart $1

     else

-        sudo /sbin/service $1 restart

+        sudo service $1 restart

     fi

+

 }

 # Only change permissions of a file or directory if it is not on an

@@ -2286,20 +2287,20 @@ function safe_chown {

 # Service wrapper to start services

 # start_service service-name

 function start_service {

-    if is_ubuntu; then

-        sudo /usr/sbin/service $1 start

+    if [ -x /bin/systemctl ]; then

+        sudo /bin/systemctl start $1

     else

-        sudo /sbin/service $1 start

+        sudo service $1 start

     fi

 }

 # Service wrapper to stop services

 # stop_service service-name

 function stop_service {

-    if is_ubuntu; then

-        sudo /usr/sbin/service $1 stop

+    if [ -x /bin/systemctl ]; then

+        sudo /bin/systemctl stop $1

     else

-        sudo /sbin/service $1 stop

+        sudo service $1 stop

     fi

 }