From 7984e37b8dd203fff2bceb101c4986959279915f Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 6 Jan 2021 16:01:05 +0100
Subject: [PATCH] docker/l3d#72 Implement "l3d info"

---
 Dockerfile          |  1 +
 run/scripts/info    | 63 +++++++++++++++++++++++++++++++++++++++++++++
 run/scripts/list    | 14 +++++-----
 run/scripts/version | 11 +++++++-
 4 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100755 run/scripts/info

diff --git a/Dockerfile b/Dockerfile
index 81e56ab..d1ee73e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,7 @@ ADD config.fish /etc/fish/
 ADD start.sh /usr/local/bin/.start
 ADD configIdea.sh /usr/local/bin/.configIdea
 ADD l3dComposer.php /usr/local/bin/.l3dComposer.php
+ADD run/scripts/info /usr/local/bin/l3d
 
 RUN echo "Install dorgflow" && \
     cd /var/opt && \
diff --git a/run/scripts/info b/run/scripts/info
new file mode 100755
index 0000000..d3df84e
--- /dev/null
+++ b/run/scripts/info
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+function sectionHeader() {
+  echo ""
+  echo "======================================================================="
+  echo $1
+  echo ""
+  echo ""
+}
+
+function sectionFooter() {
+  echo ""
+  echo "-----------------------------------------------------------------------"
+  echo ""
+}
+
+function infol3d() {
+  sectionHeader "Your L3D"
+  if [[ $HOSTMODE ]]; then
+    ${SCRIPTPATH}/version
+    echo ""
+    ${SCRIPTPATH}/list
+  else
+    if [[ "$1" == "info" ]]; then
+      echo "Here we will be printing useful information soon !!!"
+    else
+      echo "You're calling L3D inside of L3D, that's not useful."
+    fi
+  fi
+  sectionFooter
+}
+
+function infohost() {
+  sectionHeader "Your Host"
+  echo "OS: ${L3DHOSTOS}"
+  echo "User: ${USERNAME} (${USERID}:${GROUPID} - ${GROUPIDS})"
+  echo "Home: ${HOMEDIR}"
+  echo "Shell: ${L3DSHELL}"
+  echo "Workdir: ${WORKDIR}"
+  echo "SSH: ${SSHAUTH} - ${SSHAUTHSOCK}"
+  sectionFooter
+}
+
+function infodocker() {
+  sectionHeader "Your Docker"
+  docker info 2>/dev/null | grep "Server Version:"
+  docker info 2>/dev/null | grep "Operating System:"
+  docker info 2>/dev/null | grep "OSType:"
+  docker info 2>/dev/null | grep "Architecture:"
+  sectionFooter
+}
+
+SCRIPTPATH="$(cd "$(dirname "$0")" && pwd -P)"
+HOSTMODE=true
+if [[ -f ${SCRIPTPATH}/selfupdate ]]; then
+  HOSTMODE=false
+fi
+
+infol3d $1
+if [[ $HOSTMODE ]]; then
+  infohost
+  infodocker
+fi
diff --git a/run/scripts/list b/run/scripts/list
index 435d6ed..ff58f40 100755
--- a/run/scripts/list
+++ b/run/scripts/list
@@ -8,12 +8,11 @@ function listprojects() {
     echo "No active L3D projects found."
     return
   fi
-  echo "Active L3D projects:"
-  echo "===================="
-  echo ""
+  printf "Active L3D projects:"
   for CONTAINERID in `cat /tmp/l3d.lst`; do
-    docker inspect $CONTAINERID | jq -r .[0].Config.Hostname  | cut -d'-' -f 1
+    printf "   %s" "$(docker inspect $CONTAINERID | jq -r .[0].Config.Hostname  | cut -d'-' -f 1)"
   done
+  echo ""
   rm /tmp/l3d.lst
 }
 
@@ -25,12 +24,11 @@ function listnetworks() {
     echo "No active L3D networks found."
     return
   fi
-  echo "Active L3D networks:"
-  echo "===================="
-  echo ""
+  printf "Active L3D networks:"
   for NETWORKID in `cat /tmp/l3d.lst`; do
-    docker inspect $NETWORKID | jq -r .[0].Name  | cut -d'_' -f 2
+    printf "   %s" "$(docker inspect $NETWORKID | jq -r .[0].Name  | cut -d'_' -f 2)"
   done
+  echo ""
   rm /tmp/l3d.lst
 }
 
diff --git a/run/scripts/version b/run/scripts/version
index 6510e0e..5e6c41f 100755
--- a/run/scripts/version
+++ b/run/scripts/version
@@ -1,3 +1,12 @@
 #!/bin/bash
 
-echo "${VERSION}"
+echo "Version: ${VERSION}"
+
+NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
+if [[ "$NEWVERSION" == "$VERSION" ]]; then
+  return
+fi
+
+echo ""
+echo "A new version is available: $NEWVERSION"
+echo "      run 'l3d selfupdate'"
-- 
GitLab