diff --git a/.gitignore b/.gitignore index dfa2cfe..adddbaf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ domp4s extrascript dotimelapse .config.backup +ukmon.ini # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/refreshTools.sh b/refreshTools.sh index 5c77b75..7b01593 100755 --- a/refreshTools.sh +++ b/refreshTools.sh @@ -12,6 +12,13 @@ git stash git pull git stash apply +if [ ! -f $here/ukmon.ini ] ; then + echo "# config data for this station" > $here/ukmon.ini + echo "export LOCATION=NOTCONFIGURED" >> $here/ukmon.ini + echo "export UKMONHELPER=3.8.65.98" >> $here/ukmon.ini + echo "export UKMONKEY=~/.ssh/ukmon" >> $here/ukmon.ini +fi + if [ -f $here/.firstrun ] ; then if [[ "$LOCATION" != "NOTCONFIGURED" && "$LOCATION" != "" ]] ; then if [ $(file $here/ukmon.ini | grep CRLF | wc -l) -ne 0 ] ; then @@ -57,6 +64,7 @@ else read -p "Press any key to continue" fi fi + if [ $(grep ukmonPost ~/source/RMS/.config | wc -l) -eq 0 ] ; then python -c 'import ukmonPostProc as pp ; pp.installUkmonFeed();' fi diff --git a/ukmonPostProc.py b/ukmonPostProc.py index 7ba4325..4ca2505 100644 --- a/ukmonPostProc.py +++ b/ukmonPostProc.py @@ -125,8 +125,8 @@ def rmsExternal(cap_dir, arch_dir, config): uploadToArchive.uploadToArchive(arch_dir, log) - os.remove(rebootlockfile) - + # do not remote reboot lock file if running another script + # os.remove(rebootlockfile) try: with open(os.path.join(myloc, 'extrascript'),'r') as extraf: extrascript=extraf.readline().strip()