From 86fc4c0b2468614115d7cd0822805a0e2b574d5f Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 6 Jan 2021 17:01:18 +0100
Subject: [PATCH] docker/l3d#72 Implement "l3d info"
---
run/Dockerfile | 2 +-
run/scripts/l3dcurrentversion | 3 ---
run/scripts/run | 2 +-
run/scripts/selfupdate | 2 +-
run/scripts/version | 2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
delete mode 100755 run/scripts/l3dcurrentversion
diff --git a/run/Dockerfile b/run/Dockerfile
index 99fa403..de57d32 100644
--- a/run/Dockerfile
+++ b/run/Dockerfile
@@ -25,6 +25,6 @@ RUN apk add bash curl jq && \
ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \
chmod +x /usr/local/bin/docker-compose && \
- sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/l3dcurrentversion
+ sed -i -e "s/'{{ version }}'/${VERSION}/g" /usr/local/bin/run
ENTRYPOINT /bin/sh
diff --git a/run/scripts/l3dcurrentversion b/run/scripts/l3dcurrentversion
deleted file mode 100755
index 14885ca..0000000
--- a/run/scripts/l3dcurrentversion
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-export L3DVERSION='{{ version }}'
diff --git a/run/scripts/run b/run/scripts/run
index 191c7a1..8eea159 100755
--- a/run/scripts/run
+++ b/run/scripts/run
@@ -1,6 +1,6 @@
#!/bin/bash
-/usr/local/bin/l3dcurrentversion
+export L3DVERSION='{{ version }}'
COMMAND=start
if [[ -n "$1" ]]; then
diff --git a/run/scripts/selfupdate b/run/scripts/selfupdate
index 2d7420b..ef93142 100755
--- a/run/scripts/selfupdate
+++ b/run/scripts/selfupdate
@@ -3,7 +3,7 @@
if [[ -n $1 ]]; then
NEWVERSION=$1
else
- NEWVERSION=$(/usr/local/bin/l3dcurrentversion)
+ NEWVERSION=$(/usr/local/bin/l3dnewversion)
fi
if [[ "$NEWVERSION" == "" ]]; then
diff --git a/run/scripts/version b/run/scripts/version
index 66ebd6c..ba93bf4 100755
--- a/run/scripts/version
+++ b/run/scripts/version
@@ -2,7 +2,7 @@
echo "Version: ${L3DVERSION}"
-NEWVERSION=$(/usr/local/bin/l3dcurrentversion)
+NEWVERSION=$(/usr/local/bin/l3dnewversion)
if [[ "$NEWVERSION" != "" ]]; then
echo ""
echo "A new version is available: $NEWVERSION"
--
GitLab