Skip to content

Commit 69a119b

Browse files
committed
minor Linux packages changes
1 parent 6adb5f5 commit 69a119b

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

pkg/build.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ cp ../open_source_licenses.txt build/usr/share/doc/wavefront-proxy/
1919
cp ../open_source_licenses.txt build/opt/wavefront/wavefront-proxy
2020
cp wavefront-proxy.jar build/opt/wavefront/wavefront-proxy/bin
2121

22-
declare -A deps=(["deb"]="openjdk-11-jre" ["rpm"]="java-11-openjdk")
23-
2422
for target in deb rpm
2523
do
2624
fpm \
2725
--after-install after-install.sh \
2826
--before-remove before-remove.sh \
2927
--after-remove after-remove.sh \
30-
--architecture amd64 \
28+
--architecture all \
3129
--deb-no-default-config-files \
3230
--deb-priority optional \
33-
--depends ${deps[$target]} \
3431
--description "Proxy for sending data to Wavefront." \
3532
--exclude "*/.git" \
3633
--iteration $ITERATION \

pkg/etc/init.d/wavefront-proxy

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,15 @@ status()
126126

127127
stop()
128128
{
129-
echo "Stopping $desc"
130-
PID=$(cat $pid_file);
131-
kill $PID;
132-
rm ${pid_file}
133-
echo "Done"
129+
if [[ -f "$pid_file" ]]; then
130+
echo "Stopping $desc"
131+
PID=$(cat $pid_file);
132+
kill $PID;
133+
rm ${pid_file}
134+
echo "Done"
135+
else
136+
echo "$desc is not running."
137+
fi
134138
}
135139

136140
restart()

0 commit comments

Comments
 (0)