diff --git a/tests/lib/snaps.sh b/tests/lib/snaps.sh index 6a17c2bd4ec..28370bf9d70 100644 --- a/tests/lib/snaps.sh +++ b/tests/lib/snaps.sh @@ -5,13 +5,14 @@ make_snap() { local SNAP_DIR="${2:-$TESTSLIB/snaps/${SNAP_NAME}}" local SNAP_VERSION="${3:-1.0}" - local META_FILE="$SNAP_DIR/meta/snap.yaml" + local META_FILE META_NAME SNAP_FILE + META_FILE="$SNAP_DIR/meta/snap.yaml" if [ ! -f "$META_FILE" ]; then echo "snap.yaml file not found for $SNAP_NAME snap" return 1 fi - local META_NAME="$(grep '^name:' "$META_FILE" | awk '{ print $2 }' | tr -d ' ')" - local SNAP_FILE="${SNAP_DIR}/${META_NAME}_${SNAP_VERSION}_all.snap" + META_NAME="$(grep '^name:' "$META_FILE" | awk '{ print $2 }' | tr -d ' ')" + SNAP_FILE="${SNAP_DIR}/${META_NAME}_${SNAP_VERSION}_all.snap" # assigned in a separate step to avoid hiding a failure if [ ! -f "$SNAP_FILE" ]; then snap pack "$SNAP_DIR" "$SNAP_DIR" >/dev/null diff --git a/tests/lib/tools/snaps-state b/tests/lib/tools/snaps-state index e704361b332..e3d913ed986 100755 --- a/tests/lib/tools/snaps-state +++ b/tests/lib/tools/snaps-state @@ -19,13 +19,14 @@ pack_local() { local SNAP_DIR="${2:-$TESTSLIB/snaps/${SNAP_NAME}}" local SNAP_VERSION="${3:-1.0}" - local META_FILE="$SNAP_DIR/meta/snap.yaml" + local META_FILE META_NAME SNAP_FILE + META_FILE="$SNAP_DIR/meta/snap.yaml" if [ ! -f "$META_FILE" ]; then echo "snap.yaml file not found for $SNAP_NAME snap" return 1 fi - local META_NAME="$(grep '^name:' "$META_FILE" | awk '{ print $2 }' | tr -d ' ')" - local SNAP_FILE="${SNAP_DIR}/${META_NAME}_${SNAP_VERSION}_all.snap" + META_NAME="$(grep '^name:' "$META_FILE" | awk '{ print $2 }' | tr -d ' ')" + SNAP_FILE="${SNAP_DIR}/${META_NAME}_${SNAP_VERSION}_all.snap" # assigned in a separate step to avoid hiding a failure if [ ! -f "$SNAP_FILE" ]; then snap pack "$SNAP_DIR" "$SNAP_DIR" >/dev/null