From ead57967ce78fee4a765d5adc6ba73304ec4e70b Mon Sep 17 00:00:00 2001 From: Samuele-StackUser Date: Wed, 5 Feb 2020 19:52:09 +0100 Subject: [PATCH] Update conf! Changes to be committed: modified: IobMan.sls new file: IobUpdStart.bat new file: IobUpdStop.bat modified: IobWin.sls modified: IobWinDev.sls --- .IobUpdStart.bat.swp | Bin 0 -> 12288 bytes IobMan.sls | 37 ++++++++++------------------------ IobUpdStart.bat | 11 +++++++++++ IobUpdStop.bat | 4 ++++ IobWin.sls | 46 +++++++++++++++++++++++++++++-------------- IobWinDev.sls | 16 ++++++++------- 6 files changed, 65 insertions(+), 49 deletions(-) create mode 100644 .IobUpdStart.bat.swp create mode 100644 IobUpdStart.bat create mode 100644 IobUpdStop.bat diff --git a/.IobUpdStart.bat.swp b/.IobUpdStart.bat.swp new file mode 100644 index 0000000000000000000000000000000000000000..bd0e0acdce7082cf15c47e2d098649ba4e3bd9df GIT binary patch literal 12288 zcmeI&&ubGw6bJBEFCI!&^el{#9K^bt)>foNA^s@rA+01<5rQ(Ao!Du&JIlrT7sR=<+sBSVBLpA-0SG_<0uX=z1R(H#3Y5hhz2c>vXqGqMT<3ne zHjlVK00Izz00bZa0SG_<0uX=z1R(Ga3doe`?E=vkj`08g(eM9Hr-|Nkyyn>DSmpS5 zis%hT!f}aXo+G^XIlPMl0uX=z1Rwwb2tWV=5P$##{vLr+`n^4qWg_N1->qcp)|H3J zW~5)}mWVg#*WOE7=SZ*OgGOm};yz745+<6hGLGpU}m_YYFuVcr&X&bqYt(e(78I$mR4*syR` zY44+5Z}aJ4p~@e7DOlXoPI#j#rzaCB#!@L`1<%6gRA*vrGA&ZWE&13yjiQLO+Ogv1 zbmpT1sv?vcxhk)7CwXd=6^E_U&LZW>ICseCbtw)Pd7~ZPUwgUKSzKv1_tzGe+i`Qh U!uNINK7U??c3h(@rFD|N0?o|Tl>h($ literal 0 HcmV?d00001 diff --git a/IobMan.sls b/IobMan.sls index 93fb59f..67cd479 100644 --- a/IobMan.sls +++ b/IobMan.sls @@ -7,24 +7,11 @@ download-IOB-MAN: - makedirs: True - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN-stable.zip.md5 -# per sicurezza faccio copio del file di config... -config-backup: - cmd.run: - - name: "copy /Y c:\\Steamware\\IOB-MAN\\CONF\\process.json c:\\Steamware\\src\\process.json" - -# indico update in esecuzione da file... -set-update-run: - cmd.run: - - name: "echo > c:\\Steamware\\IOB-MAN\\update.run" - -# chiudo il task in esecuzione -close-IOB-MAN: - cmd.run: - - name: "taskkill /IM \"IOB-MAN.exe\" /F" - -close-IOB-WIN: - cmd.run: - - name: "taskkill /IM \"IOB-WIN.exe\" /F" +# Script inizio update (copia conf + kill) +ManUpdStart: + cmd.script: + - name: c:/Steamware/src/IobUpdStart.bat + - source: salt://IobUpdStart.bat ## faccio pulizia da dll e altro nella folder... #clean-IOB-MAN-dll: @@ -44,12 +31,8 @@ extract-IOB-MAN: - enforce_toplevel: False - overwrite: True -# Restore finale config -config-restore: - cmd.run: - - name: "copy /Y c:\\Steamware\\src\\process.json c:\\Steamware\\IOB-MAN\\CONF\\process.json" - -# indico update completato... -set-update-done: - cmd.run: - - name: "del /f c:\\Steamware\\IOB-MAN\\update.run" +# Script fine update (restore conf + lock remove) +ManUpdStop: + cmd.script: + - name: c:/Steamware/src/IobUpdStop.bat + - source: salt://IobUpdStop.bat diff --git a/IobUpdStart.bat b/IobUpdStart.bat new file mode 100644 index 0000000..619f33e --- /dev/null +++ b/IobUpdStart.bat @@ -0,0 +1,11 @@ +REM Recupero dataora +set mydate=%date:~10,4%%date:~6,2%/%date:~4,2% +REM Indico update in esecuzione da file... +echo > c:\Steamware\IOB-MAN\update.run +REM Per sicurezza faccio copio del file di config... +copy /Y c:\Steamware\IOB-MAN\CONF\process.json c:\Steamware\src\process.json +robocopy c:\Steamware\IOB-WIN\DATA\CONF c:\Steamware\src\IOB-WIN\CONF_%mydate% /MIR +robocopy c:\Steamware\IOB-WIN\DATA\CONF c:\Steamware\src\IOB-WIN\CONF /MIR +REM chiudo i task in esecuzione +taskkill /IM "IOB-MAN.exe" /F +taskkill /IM "IOB-WIN.exe" /F diff --git a/IobUpdStop.bat b/IobUpdStop.bat new file mode 100644 index 0000000..4a00b9d --- /dev/null +++ b/IobUpdStop.bat @@ -0,0 +1,4 @@ +REM Riporto indietro file conf +copy /Y c:\Steamware\src\process.json c:\Steamware\IOB-MAN\CONF\process.json +REM cancello file blocco rilancio +del /f c:\Steamware\IOB-MAN\update.run diff --git a/IobWin.sls b/IobWin.sls index 0f10a13..9a968ea 100644 --- a/IobWin.sls +++ b/IobWin.sls @@ -5,23 +5,31 @@ download-IOB-WIN: - makedirs: True - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN-stable.zip.md5 -clean-OLD-CONF: - cmd.run: - - name: "del /f c:\\Steamware\\src\\IOB-WIN\\CONF\\*" + +# Script inizio update (copia conf + kill) +WinUpdStart: + cmd.script: + - name: c:/Steamware/src/IobUpdStart.bat + - source: salt://IobUpdStart.bat # per sicurezza faccio copio del file di config... -config-backup: - cmd.run: - - name: "copy /Y c:\\Steamware\\IOB-WIN\\CONF\\* c:\\Steamware\\src\\IOB-WIN\\CONF\\*" +#config-backup: +# cmd.run: +# - name: "robocopy c:\\Steamware\\IOB-WIN\\DATA\\CONF c:\\Steamware\\src\\IOB-WIN\\CONF /MIR" # indico update in esecuzione da file... -set-update-run: - cmd.run: - - name: "echo > c:\\Steamware\\IOB-WIN\\update.run" +#set-update-run: +# cmd.run: +# - name: "echo > c:\\Steamware\\IOB-MAN\\update.run" -close-IOB-WIN: - cmd.run: - - name: "taskkill /IM \"IOB-WIN.exe\" /F" +# chiudo il task in esecuzione +#close-IOB-MAN: +# cmd.run: +# - name: "taskkill /IM \"IOB-MAN.exe\" /F" + +#close-IOB-WIN: +# cmd.run: +# - name: "taskkill /IM \"IOB-WIN.exe\" /F" # Ora estraggo files in directory... @@ -32,9 +40,17 @@ extract-IOB-WIN: - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN-stable.zip.md5 - skip_verify: False - enforce_toplevel: False + - overwrite: True # indico update completato... -set-update-done: - cmd.run: - - name: "del /f c:\\Steamware\\IOB-WIN\\update.run" +#set-update-done: +# cmd.run: +# - name: "del /f c:\\Steamware\\IOB-MAN\\update.run" + + +# Script fine update (restore conf + lock remove) +WinUpdStop: + cmd.script: + - name: c:/Steamware/src/IobUpdStop.bat + - source: salt://IobUpdStop.bat diff --git a/IobWinDev.sls b/IobWinDev.sls index bfde0f8..f0abd56 100644 --- a/IobWinDev.sls +++ b/IobWinDev.sls @@ -5,19 +5,20 @@ download-IOB-WIN: - makedirs: True - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/unstable/IOB-WIN-unstable.zip.md5 -clean-OLD-CONF: - cmd.run: - - name: "del /f c:\\Steamware\\src\\IOB-WIN\\CONF\\*" - # per sicurezza faccio copio del file di config... config-backup: cmd.run: - - name: "copy /Y c:\\Steamware\\IOB-WIN\\CONF\\* c:\\Steamware\\src\\IOB-WIN\\CONF\\*" + - name: "robocopy c:\\Steamware\\IOB-WIN\\DATA\\CONF c:\\Steamware\\src\\IOB-WIN\\CONF /MIR" # indico update in esecuzione da file... set-update-run: cmd.run: - - name: "echo > c:\\Steamware\\IOB-WIN\\update.run" + - name: "echo > c:\\Steamware\\IOB-MAN\\update.run" + +# chiudo il task in esecuzione +close-IOB-MAN: + cmd.run: + - name: "taskkill /IM \"IOB-MAN.exe\" /F" close-IOB-WIN: cmd.run: @@ -32,9 +33,10 @@ extract-IOB-WIN: - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/unstable/IOB-WIN-unstable.zip.md5 - skip_verify: False - enforce_toplevel: False + - overwrite: True # indico update completato... set-update-done: cmd.run: - - name: "del /f c:\\Steamware\\IOB-WIN\\update.run" + - name: "del /f c:\\Steamware\\IOB-MAN\\update.run"