From 5a69bbe93e5d5339e285aeb72c03288c560d5b81 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 16 Feb 2024 17:47:05 +0700 Subject: [PATCH 1/3] demo script --- pkgs/clan-vm-manager/demo.sh | 47 +++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/pkgs/clan-vm-manager/demo.sh b/pkgs/clan-vm-manager/demo.sh index 9f2a8506..a3969649 100755 --- a/pkgs/clan-vm-manager/demo.sh +++ b/pkgs/clan-vm-manager/demo.sh @@ -1,8 +1,34 @@ #!/usr/bin/env bash -set -eux -o pipefail +set -e -o pipefail + +check_git_tag() { + local repo_path="$1" + local target_tag="$2" + + # Change directory to the specified Git repository + pushd "$repo_path" > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Error: Failed to change directory to $repo_path" + return 1 + fi + + # Get the current Git tag + local current_tag=$(git describe --tags --exact-match 2>/dev/null) + + # Restore the original directory + popd > /dev/null 2>&1 + + # Check if the current tag is 2.0 + if [ "$current_tag" = "$target_tag" ]; then + echo "Current Git tag in $repo_path is $target_tag" + else + echo "Error: Current Git tag in $repo_path is not $target_tag" + exit 1 + fi +} + -rm -r ~/.config/clan if [ -z "$1" ]; then echo "Usage: $0 " @@ -11,19 +37,16 @@ fi democlan="$1" -clan history add "clan://$democlan#syncthing-peer1" -clan history add "clan://$democlan#syncthing-peer2" +check_git_tag "$democlan" "v2.0" -clan history add "clan://$democlan#moonlight-peer1" -clan history add "clan://$democlan#moonlight-peer2" +check_git_tag "." "v2.0" + +rm -rf ~/.config/clan + +clan history add "clan://$democlan#localsend-wayland1" clear cat << EOF Open up this link in a browser: -"clan://$democlan#syncthing-introducer" -EOF - -cat << EOF -Execute this command to show waypipe windows: -$ clan --flake $democlan vms run wayland +"clan://$democlan#localsend-wayland2" EOF -- 2.45.2 From 446039b02bf391bd9551c26e3019d8964ab5e98d Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 16 Feb 2024 17:47:34 +0700 Subject: [PATCH 2/3] Working demo script --- pkgs/clan-vm-manager/demo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-vm-manager/demo.sh b/pkgs/clan-vm-manager/demo.sh index a3969649..53c951d0 100755 --- a/pkgs/clan-vm-manager/demo.sh +++ b/pkgs/clan-vm-manager/demo.sh @@ -37,9 +37,9 @@ fi democlan="$1" -check_git_tag "$democlan" "v2.0" +check_git_tag "$democlan" "v2.2" -check_git_tag "." "v2.0" +check_git_tag "." "v2.2" rm -rf ~/.config/clan -- 2.45.2 From c566872f0583e00bf21106cedfa73611ef6f0546 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 16 Feb 2024 17:51:55 +0700 Subject: [PATCH 3/3] Working demo script --- pkgs/clan-vm-manager/demo.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-vm-manager/demo.sh b/pkgs/clan-vm-manager/demo.sh index 53c951d0..7b605f5b 100755 --- a/pkgs/clan-vm-manager/demo.sh +++ b/pkgs/clan-vm-manager/demo.sh @@ -8,13 +8,15 @@ check_git_tag() { # Change directory to the specified Git repository pushd "$repo_path" > /dev/null 2>&1 + # shellcheck disable=SC2181 if [ $? -ne 0 ]; then echo "Error: Failed to change directory to $repo_path" return 1 fi # Get the current Git tag - local current_tag=$(git describe --tags --exact-match 2>/dev/null) + local current_tag + current_tag=$(git describe --tags --exact-match 2>/dev/null) # Restore the original directory popd > /dev/null 2>&1 @@ -39,7 +41,7 @@ democlan="$1" check_git_tag "$democlan" "v2.2" -check_git_tag "." "v2.2" +check_git_tag "." "v2.3" rm -rf ~/.config/clan -- 2.45.2