Refactor (#6306)

Author: tremor021

ct/grafana.sh

@@ -27,6 +27,7 @@ function update_script() {
       msg_error "No ${APP} Installation Found!"
       exit
    fi
+   
    msg_info "Updating ${APP}"
    $STD apt-get update
    $STD apt-get -y upgrade
@@ -41,4 +42,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"

install/grafana-install.sh

@@ -14,20 +14,20 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y apt-transport-https
-$STD apt-get install -y software-properties-common
+$STD apt-get install -y \
+  apt-transport-https \
+  software-properties-common
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Grafana Repository"
 curl -fsSL "https://apt.grafana.com/gpg.key" -o "/usr/share/keyrings/grafana.key"
-sh -c 'echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" > /etc/apt/sources.list.d/grafana.list'
+echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" >/etc/apt/sources.list.d/grafana.list
 msg_ok "Set up Grafana Repository"
 
 msg_info "Installing Grafana"
 $STD apt-get update
 $STD apt-get install -y grafana
-systemctl start grafana-server
-systemctl enable --now -q grafana-server.service
+systemctl enable -q --now  grafana-server
 msg_ok "Installed Grafana"
 
 motd_ssh