Skip to content

fix issue with ini file icon and reboots #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markmac99 merged 5 commits into from
Sep 14, 2021
Merged

fix issue with ini file icon and reboots #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73c57e5
do not remove reboot lock file too soon
markmac99 Sep 14, 2021
1105c79
create dummy ukmon.ini file if not present
markmac99 Sep 14, 2021
84f77be
ensure a default ini file exists
markmac99 Sep 14, 2021
751d821
bugfix
markmac99 Sep 14, 2021
7022619
ignore ukmon.ini
markmac99 Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ domp4s
extrascript
dotimelapse
.config.backup
ukmon.ini

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
8 changes: 8 additions & 0 deletions refreshTools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ukmonPostProc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down