add kelvin-testnet

small fixes in install scripts for mac

fixed mistakes

fixed path to daemon on rm

remove agents before install on mac

linux/debian/essentials/prerm

@@ -2,10 +2,10 @@
 
 case "$1" in
     purge|remove|abort-upgrade|failed-upgrade|upgrade)
-    [ -f /etc/init.d/cellframe-dashboard ] && service cellframe-dashboard stop
+    [ -f /etc/systemd/user/cellframe-dashboard.service ] && service cellframe-dashboard stop
     [ -d /opt/cellframe-dashboard ] && rm -rf /opt/cellframe-dashboard/
     [ -f /usr/local/bin/Cellframe-Dashboard ] && rm /usr/local/bin/Cellframe-Dashboard
-    [ -f /etc/init.d/cellframe-dashboard ] && rm /etc/init.d/cellframe-dashboard
+    [ -f /etc/systemd/user/cellframe-dashboard.service ] && rm /etc/init.d/cellframe-dashboard
     systemctl daemon-reload
     [ -f /usr/share/applications/CellFrameDashboard.desktop ] && rm /usr/share/applications/CellFrameDashboard.desktop
     [ -f /usr/share/pixmaps/CellFrameDdashboard.ico ] && rm /usr/share/pixmaps/CellFrameDashboard.ico

linux/debian/scripts/deploy.sh

@@ -32,10 +32,10 @@ for pkgfile in $PKGFILES; do
 	ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "mkdir -p $CELLFRAME_FILESERVER_PATH/$SUBDIR"
 	scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/$pkgname_public$MOD.deb"
 	scp -r -i $CELLFRAME_REPO_KEY ../prod_build/general/essentials/$pkgname_weblink "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/"
-	if [[ $CI_COMMIT_REF_NAME == "master" ]]; then
-		scp -P $CELLFRAME_REPO_PORT -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_REPO_CREDS:~/aptly/repo_update/$pkgname_public$MOD.deb"
-#			ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" -- "~/aptly/repo_update.sh"
-	fi
+# 	if [[ $CI_COMMIT_REF_NAME == "master" ]]; then
+# 		scp -P $CELLFRAME_REPO_PORT -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_REPO_CREDS:~/aptly/repo_update/$pkgname_public$MOD.deb"
+# #			ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" -- "~/aptly/repo_update.sh"
+# 	fi
 #		ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "ln -sf $CELLFRAME_FILESERVER_PATH/$pkgname$MOD.deb $CELLFRAME_FILESERVER_PATH/$pkgname$MOD-latest.deb"
 	rm -r ../prod_build/general/essentials/$pkgname_weblink
 done

mac/essentials/Cellframe-Dashboard-pkginstall/postinstall

@@ -51,8 +51,8 @@ sudo chmod 644 /Applications/"$APP_NAME".app/Contents/Resources/$SERVICE.plist
 sudo chown $USER /Applications/"$APP_NAME".app/Contents/Resources/$NODE.plist
 sudo chmod 644 /Applications/"$APP_NAME".app/Contents/Resources/$NODE.plist
 
- sudo -u $USER ln -sf /Applications/"$APP_NAME".app/Contents/Resources/$SERVICE.plist /Users/$USER/Library/LaunchAgents/$SERVICE.plist
- sudo -u $USER ln -sf /Applications/"$APP_NAME".app/Contents/Resources/$NODE.plist /Users/$USER/Library/LaunchAgents/$NODE.plist
+ sudo ln -sf /Applications/"$APP_NAME".app/Contents/Resources/$SERVICE.plist /Users/$USER/Library/LaunchAgents/$SERVICE.plist
+ sudo ln -sf /Applications/"$APP_NAME".app/Contents/Resources/$NODE.plist /Users/$USER/Library/LaunchAgents/$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
 

mac/essentials/Cellframe-Dashboard-pkginstall/preinstall

@@ -39,8 +39,8 @@ done <<< "$GuiPIDs"
 echo "unloading the weirdo deps" >> /tmp/debug_dashboard.txt
 
 
-[ -e /Library/LaunchDaemons/com.demlabs."$APP_NAME"Service.plist ] && sudo launchctl unload -w /Library/LaunchDaemons/com.demlabs."$APP_NAME"Service.plist
-[ -e /Library/LaunchDaemons/com.demlabs.cellframe-node.plist ] && sudo launchctl unload -w /Library/LaunchDaemons/com.demlabs.cellframe-node.plist
+[ -e /Library/LaunchDaemons/com.demlabs."$APP_NAME"Service.plist ] && launchctl unload -w /Users/$USER/Library/LaunchAgents/com.demlabs."$APP_NAME"Service.plist
+[ -e /Library/LaunchDaemons/com.demlabs.cellframe-node.plist ] && launchctl unload -w /Users/$USER/Library/LaunchAgents/com.demlabs.cellframe-node.plist
 
 #udo rm -fr /Applications/${BRAND}.app
 

mac/essentials/create_configs.sh

@@ -17,6 +17,9 @@ export DAP_SERVER_PORT=8089
 export DAP_CORE_T_ENABLED=true
 export DAP_CORE_T_ROLE=full
 
+# Kelvin testnet
+export DAP_KELVIN_TESTNET_ENABLED=true
+export DAP_KELVIN_TESTNET_ROLE=full
+
 echo "Init configs with prefix " $DAP_PREFIX
 /Applications/Cellframe-Dashboard.app/Contents/Resources/create_configs_from_tpl.sh
-