From dab0d7349e6477b4dd31b3c011803040a2c6dcb9 Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Wed, 2 Jun 2021 08:08:54 -0500
Subject: [PATCH] minor simplification/cleanup
---
ShellB3/shallbethree.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index 8d40ff4b..8dc7c964 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -58,7 +58,7 @@ export BASE=$PWD
ID="$Id$"
if [ -d ../.git ] ; then
- REVNUM=GIT$( git rev-parse --verify HEAD | cut -c-8 )
+ REVNUM=GIT$( git rev-parse --verify HEAD --short )
REVDATE=$( ${ANYPYTHON} -c "from datetime import datetime; print(datetime.fromtimestamp( float( $( git show -s --format=\"%ct\") ) ).strftime(\"%Y%m%d\"))" )
elif [ -d .svn ] ; then
REVNUM=$(echo $ID |cut -f 3 -d ' ')
@@ -999,7 +999,7 @@ export PY38FSVER=3.8
export PY39VER=3.9.5
export PY39FSVER=3.9
-export LLVMSIMPLEVER=$(echo ${LLVMVER} | cut -c-3)
+export LLVMSIMPLEVER=$( python -c "import sys; print('.'.join(sys.argv[1].split('.')[:2]))" ${LLVMVER} )
_reloadpythonversion(){
if [ -f build/.pythonversion ] ; then
--
GitLab