da782a8237
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/grafana#fa4f56cd7cde56d3cb3318f12605d3776b62dd5c
27 lines
767 B
Diff
27 lines
767 B
Diff
diff --git a/packaging/wrappers/grafana-cli b/packaging/wrappers/grafana-cli
|
|
index 9cad151c0d..6b7ec1ab42 100755
|
|
--- a/packaging/wrappers/grafana-cli
|
|
+++ b/packaging/wrappers/grafana-cli
|
|
@@ -12,11 +12,12 @@ CONF_DIR=/etc/grafana
|
|
DATA_DIR=/var/lib/grafana
|
|
PLUGINS_DIR=/var/lib/grafana/plugins
|
|
LOG_DIR=/var/log/grafana
|
|
+LIBEXEC_DIR=/usr/libexec/grafana
|
|
|
|
CONF_FILE=$CONF_DIR/grafana.ini
|
|
PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
|
|
|
|
-EXECUTABLE=$GRAFANA_HOME/bin/grafana-cli
|
|
+EXECUTABLE=$LIBEXEC_DIR/grafana-cli
|
|
|
|
if [ ! -x $EXECUTABLE ]; then
|
|
echo "Program not installed or not executable"
|
|
@@ -24,6 +25,7 @@ if [ ! -x $EXECUTABLE ]; then
|
|
fi
|
|
|
|
# overwrite settings from default file
|
|
+#shellcheck disable=SC1090
|
|
if [ -f "$DEFAULT" ]; then
|
|
. "$DEFAULT"
|
|
fi
|