diff --git a/network-poc/deploy-binaries.sh b/network-poc/deploy-binaries.sh index ae5a6de..cb1316a 100755 --- a/network-poc/deploy-binaries.sh +++ b/network-poc/deploy-binaries.sh @@ -22,6 +22,7 @@ echo "" echo "[Vieminen uuteen kohteeseen...]" ssh $SSH_OPTS "$SERVER" "mkdir -p $REMOTE_DIR/frontend/dist/download" scp $SSH_OPTS "$SCRIPT_DIR/frontend/public/download"/kipina-node-* "$SERVER:$REMOTE_DIR/frontend/dist/download/" +scp $SSH_OPTS "$SCRIPT_DIR/frontend/public"/kipina-node "$SERVER:$REMOTE_DIR/frontend/dist/" # 3. Luvat kuntoon ssh $SSH_OPTS "$SERVER" "chmod +x $REMOTE_DIR/frontend/dist/download/kipina-node-*" diff --git a/network-poc/frontend/public/kipina-node b/network-poc/frontend/public/kipina-node index 743d34b..31b38db 100644 --- a/network-poc/frontend/public/kipina-node +++ b/network-poc/frontend/public/kipina-node @@ -103,16 +103,18 @@ fi BIN_PATH="./kipina-node-bin" if [ -f "$BIN_PATH" ]; then echo "" - read -p " Löydettiin vanha kipina-node-bin lokaalisti. Haluatko poistaa sen ja ladata uusimman version? [y/N] " -r DEL_CHOICE - if [[ "$DEL_CHOICE" =~ ^[Yy]$ ]]; then + read -p " Löydettiin vanha kipina-node-bin lokaalisti. Haluatko poistaa sen ja ladata uusimman version? [Y/n] " -r DEL_CHOICE + if [[ "$DEL_CHOICE" =~ ^[Nn]$ ]]; then + echo " ✓ Käytetään lokaalia versiota." + else rm -f "$BIN_PATH" - echo " ✓ Vanha binääri poistettu." + echo " ✓ Vanha binääri poistettu ja korvataan uudella." fi fi if [ ! -f "$BIN_PATH" ]; then echo " Ladataan tuorein $BINARY..." - curl -sSL "$BASE_URL/$BINARY" -o "$BIN_PATH" + curl -sSL "$BASE_URL/$BINARY?v=$(date +%s)" -o "$BIN_PATH" chmod +x "$BIN_PATH" fi diff --git a/network-poc/frontend/src/components/StatusBar.astro b/network-poc/frontend/src/components/StatusBar.astro index c692590..6755938 100644 --- a/network-poc/frontend/src/components/StatusBar.astro +++ b/network-poc/frontend/src/components/StatusBar.astro @@ -40,8 +40,8 @@
curl -sSL https://kipina.studio/kipina-node -o kipina-node && chmod +x kipina-node && ./kipina-node
-
+ curl -sSL "https://kipina.studio/kipina-node?v=$(date +%s)" -o kipina-node && chmod +x kipina-node && ./kipina-node
+