Merge branch 'no-msmq-install' into 'master'

[*] disabled msmq in nsi-builds

See merge request !52

linux/debian/essentials/postinst

@@ -13,6 +13,12 @@ DAP_CFG_TPL="$DAP_PREFIX/share/configs/$DAP_APP_NAME.cfg.tpl"
 # Store write config to new if present smth
 DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg"
 
+FLAG_CHAIN_DB_CLEAR="true"
+
+if [ "$FLAG_CHAIN_DB_CLEAR" = "true" ]; then
+    rm -r "$DAP_PREFIX/var/lib/network"
+    rm -r "$DAP_PREFIX/var/lib/global_db"
+fi
 
 
 # Check profile.d symlink
@@ -227,7 +233,7 @@ else
     chmod 0666 $DAP_CFG_TPL
     chmod 0774 $DAP_PREFIX/bin/* || true
     chmod 0777 $DAP_PREFIX/bin/$DAP_APP_NAME-cli || true
-    rm  -r $DAP_PREFIX/var/lib/global_db/gdb-cdb/
+    #rm  -r $DAP_PREFIX/var/lib/global_db/gdb-cdb/
     service cellframe-node start || true
     systemctl restart cellframe-node || true
     echo "[!] Done"

mac/essentials/Cellframe-Dashboard-pkginstall/postinstall

@@ -11,6 +11,8 @@ sudo killall -HUP mDNSResponder
 
 EXEC_PREFIX=/Applications/$APP_NAME.app/Contents/Resources
 
+FLAG_CHAIN_DB_CLEAR="true"
+
 mkdir -p $DAP_PREFIX
 sudo mv -f /Applications/$APP_NAME.app/Contents/Resources/etc $DAP_PREFIX
 sudo mv -f /Applications/$APP_NAME.app/Contents/Resources/share $DAP_PREFIX
@@ -56,7 +58,12 @@ sudo chmod 644 /Applications/"$APP_NAME".app/Contents/Resources/$NODE.plist
  sudo -u $USER launchctl load -w /Users/$USER/Library/LaunchAgents/$NODE.plist
  sudo -u $USER launchctl load -w /Users/$USER/Library/LaunchAgents/$SERVICE.plist
 
- rm -r /Users/$USER/Applications/"$APP_NAME".app/Contents/Resources/var/lib/global_db/gdb-cdb/
+ #rm -r /Users/$USER/Applications/"$APP_NAME".app/Contents/Resources/var/lib/global_db/gdb-cdb/
+
+if [ "$FLAG_CHAIN_DB_CLEAR" = "true" ]; then
+    rm -r "$DAP_PREFIX/var/lib/network"
+    rm -r "$DAP_PREFIX/var/lib/global_db"
+fi
 
  sudo -u $USER launchctl start $NODE
  sudo -u $USER launchctl start $SERVICE
@@ -72,4 +79,4 @@ SetFile -a C /Applications/cellframe-uninstaller
 echo "node agent: $(launchctl list | grep cell)" > /tmp/cellframe-dashboard_install_logs.txt
 echo "service agent: $(launchctl list | grep cell)" > /tmp/cellframe-dashboard_install_logs.txt
 
-cd $wd
+cd $wd
\ No newline at end of file

windows/scripts/build.nsi

@@ -26,6 +26,8 @@ Unicode true
 
 !define MUI_COMPONENTSPAGE_TEXT_TOP ""
 
+var FLAG_CHAIN_DB_CLEAR
+
 Name 	"${APP_NAME}"
 OutFile	"${APP_NAME} ${APP_VER}.exe"
 BrandingText "${APP_NAME} by ${PUBLISHER}"
@@ -65,20 +67,13 @@ Function UninstPrev
 	Fin:
 FunctionEnd
 
-Function EnableMSMQ
-	Push $R0
-	Push $R1
-	ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-	${DisableX64FSRedirection}
-	StrCpy $R1 $R0 3
-	DetailPrint "WinNT version: $R1"
-	StrCmp $R1 '6.0' +1 0
-	StrCmp $R1 '6.1' 0 +1
-	nsExec::ExecToLog /OEM  'dism /online /enable-feature /featurename:MSMQ-Container /featurename:MSMQ-Server /featurename:MSMQ-Multicast /NoRestart'
-	Goto +2
-	nsExec::ExecToLog /OEM  'dism /online /enable-feature /featurename:MSMQ-Server /All /NoRestart'
-	Pop $R1
-	Pop $R0
+
+Function clearDBandChains
+    StrCpy $FLAG_CHAIN_DB_CLEAR "true"
+    ${If} $FLAG_CHAIN_DB_CLEAR == "true"
+    RMDir /r "$ConfigPath\var\lib\network"
+    RMDir /r "$ConfigPath\var\lib\global_db"
+    ${EndIf}
 FunctionEnd
 
 !insertmacro MUI_PAGE_WELCOME
@@ -157,6 +152,7 @@ Section "${APP_NAME}" CORE
 	File "${NODE_NAME}.exe"
 	File "${NODE_NAME}-cli.exe"
 	File "${NODE_NAME}-tool.exe"
+    Call clearDBandChains
 !insertmacro varPaths
 	InitPluginsDir
 	SetOutPath "$PLUGINSDIR"
@@ -195,7 +191,6 @@ Section "${APP_NAME}" CORE
 SectionEnd
 
 Section -startNode
-	Call EnableMSMQ
 	Exec '"$INSTDIR\${NODE_NAME}.exe"'
 	;Exec '"$INSTDIR\${APP_NAME}Service.exe"'
 	nsExec::ExecToLog /OEM '"$INSTDIR\${APP_NAME}Service.exe" install'