File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11#! /usr/bin/env bash -il
22
3- [ -f " ${PWD} /Package.swift" ]
4- PACKAGE_EXISTS=" $? "
3+ ORIGINAL_DIR=" ${PWD} "
4+ HAS_EXISTING_PACKAGE=0
5+ [ -f " ${PWD} /Package.swift" ] && HAS_EXISTING_PACKAGE=1
56GIT_ROOT=$( git rev-parse --show-toplevel 2> /dev/null)
67SCRIPT_PATH=$( realpath --relative-to=" $GIT_ROOT " " $0 " 2> /dev/null || realpath " $0 " )
78SUBCOMMAND=" $1 "
4142a11y_scan () {
4243 # Ensure Package.swift is removed on exit (acts like a finally block)
4344 cleanup () {
44- if [ $PACKAGE_EXISTS -eq 0 ]; then
45+ if [ $HAS_EXISTING_PACKAGE -eq 1 ]; then
4546 return
4647 fi
47- rm -f -- " ${PWD} /Package.swift" " ${PWD} /Package.resolved"
48+ if [ -n " $WORK_DIR " ] && [ -d " $WORK_DIR " ]; then
49+ rm -rf -- " $WORK_DIR "
50+ fi
4851 }
4952 trap cleanup EXIT
5053
5154 setup () {
52- if [ $PACKAGE_EXISTS -eq 0 ]; then
55+ if [ $HAS_EXISTING_PACKAGE -eq 1 ]; then
56+ WORK_DIR=" $ORIGINAL_DIR "
5357 return
5458 fi
5559
56- cat > Package.swift << EOF
60+ WORK_DIR=$( mktemp -d)
61+ cat > " $WORK_DIR /Package.swift" << EOF
5762// swift-tools-version: 5.9
5863import PackageDescription
5964
7176 if [[ -z " $EXTRA_ARGS " ]]; then
7277 EXTRA_ARGS=" --include **/*.swift --include **/*.xib --include **/*.storyboard"
7378 fi
79+ cd " $WORK_DIR "
7480 env -i HOME=" $HOME " \
7581 XCODE_VERSION_ACTUAL=" $XCODE_VERSION_ACTUAL " \
7682 BROWSERSTACK_USERNAME=" $BROWSERSTACK_USERNAME " \
Original file line number Diff line number Diff line change @@ -13,8 +13,9 @@ export BROWSERSTACK_USERNAME=$($fish_bin -lic 'echo $BROWSERSTACK_USERNAME' | ta
1313export BROWSERSTACK_ACCESS_KEY=$( $fish_bin -lic ' echo $BROWSERSTACK_ACCESS_KEY' | tail -n 1)
1414
1515# Don't change anything after this, same as the bash equivalent
16- [ -f " ${PWD} /Package.swift" ]
17- PACKAGE_EXISTS=" $? "
16+ ORIGINAL_DIR=" ${PWD} "
17+ HAS_EXISTING_PACKAGE=0
18+ [ -f " ${PWD} /Package.swift" ] && HAS_EXISTING_PACKAGE=1
1819GIT_ROOT=$( git rev-parse --show-toplevel 2> /dev/null)
1920SCRIPT_PATH=$( realpath --relative-to=" $GIT_ROOT " " $0 " 2> /dev/null || realpath " $0 " )
2021SUBCOMMAND=" $1 "
5455a11y_scan () {
5556 # Ensure Package.swift is removed on exit (acts like a finally block)
5657 cleanup () {
57- if [ $PACKAGE_EXISTS -eq 0 ]; then
58+ if [ $HAS_EXISTING_PACKAGE -eq 1 ]; then
5859 return
5960 fi
60- rm -f -- " ${PWD} /Package.swift" " ${PWD} /Package.resolved"
61+ if [ -n " $WORK_DIR " ] && [ -d " $WORK_DIR " ]; then
62+ rm -rf -- " $WORK_DIR "
63+ fi
6164 }
6265 trap cleanup EXIT
6366
6467 setup () {
65- if [ $PACKAGE_EXISTS -eq 0 ]; then
68+ if [ $HAS_EXISTING_PACKAGE -eq 1 ]; then
69+ WORK_DIR=" $ORIGINAL_DIR "
6670 return
6771 fi
6872
69- cat > Package.swift << EOF
73+ WORK_DIR=$( mktemp -d)
74+ cat > " $WORK_DIR /Package.swift" << EOF
7075// swift-tools-version: 5.9
7176import PackageDescription
7277
8489 if [[ -z " $EXTRA_ARGS " ]]; then
8590 EXTRA_ARGS=" --include **/*.swift --include **/*.xib --include **/*.storyboard"
8691 fi
92+ cd " $WORK_DIR "
8793 env -i HOME=" $HOME " \
8894 XCODE_VERSION_ACTUAL=" $XCODE_VERSION_ACTUAL " \
8995 BROWSERSTACK_USERNAME=" $BROWSERSTACK_USERNAME " \
Original file line number Diff line number Diff line change @@ -12,8 +12,9 @@ export BROWSERSTACK_USERNAME=$($zsh_bin -lic 'echo $BROWSERSTACK_USERNAME' | tai
1212export BROWSERSTACK_ACCESS_KEY=$( $zsh_bin -lic ' echo $BROWSERSTACK_ACCESS_KEY' | tail -n 1)
1313
1414# Don't change anything after this, same as the bash equivalent
15- [ -f " ${PWD} /Package.swift" ]
16- PACKAGE_EXISTS=" $? "
15+ ORIGINAL_DIR=" ${PWD} "
16+ HAS_EXISTING_PACKAGE=0
17+ [ -f " ${PWD} /Package.swift" ] && HAS_EXISTING_PACKAGE=1
1718GIT_ROOT=$( git rev-parse --show-toplevel 2> /dev/null)
1819SCRIPT_PATH=$( realpath --relative-to=" $GIT_ROOT " " $0 " 2> /dev/null || realpath " $0 " )
1920SUBCOMMAND=" $1 "
5354a11y_scan () {
5455 # Ensure Package.swift is removed on exit (acts like a finally block)
5556 cleanup () {
56- if [ $PACKAGE_EXISTS -eq 0 ]; then
57+ if [ $HAS_EXISTING_PACKAGE -eq 1 ]; then
5758 return
5859 fi
59- rm -f -- " ${PWD} /Package.swift" " ${PWD} /Package.resolved"
60+ if [ -n " $WORK_DIR " ] && [ -d " $WORK_DIR " ]; then
61+ rm -rf -- " $WORK_DIR "
62+ fi
6063 }
6164 trap cleanup EXIT
6265
6366 setup () {
64- if [ $PACKAGE_EXISTS -eq 0 ]; then
67+ if [ $HAS_EXISTING_PACKAGE -eq 1 ]; then
68+ WORK_DIR=" $ORIGINAL_DIR "
6569 return
6670 fi
6771
68- cat > Package.swift << EOF
72+ WORK_DIR=$( mktemp -d)
73+ cat > " $WORK_DIR /Package.swift" << EOF
6974// swift-tools-version: 5.9
7075import PackageDescription
7176
8388 if [[ -z " $EXTRA_ARGS " ]]; then
8489 EXTRA_ARGS=" --include **/*.swift --include **/*.xib --include **/*.storyboard"
8590 fi
91+ cd " $WORK_DIR "
8692 env -i HOME=" $HOME " \
8793 XCODE_VERSION_ACTUAL=" $XCODE_VERSION_ACTUAL " \
8894 BROWSERSTACK_USERNAME=" $BROWSERSTACK_USERNAME " \
You can’t perform that action at this time.
0 commit comments