+
Skip to content

Fix shellcheck errors, like using find instead of ls #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 7, 2022
Merged

Fix shellcheck errors, like using find instead of ls #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa52df8
Fix a shellcheck error by using find instead of ls
kienstra Aug 7, 2022
f56825e
Update unit tests for latest changes
kienstra Aug 7, 2022
27854b1
Wrap find statement in double quotes
kienstra Aug 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/test/expected/with-cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@ jobs:
restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.npm" "/tmp/local-ci/v2-deps*/.npm")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;
done
restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.cache" "/tmp/local-ci/v2-deps*/.cache")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;
done
- run:
name: Install dependencies
command: npm ci
Expand Down Expand Up @@ -195,25 +195,25 @@ jobs:
restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.npm" "/tmp/local-ci/v2-deps*/.npm" "/tmp/local-ci/node-modules-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.npm")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;
done
restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.cache" "/tmp/local-ci/v2-deps*/.cache" "/tmp/local-ci/node-modules-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.cache")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;
done
- run:
name: Run e2e tests
command: npm run test:e2e:headless
Expand Down
24 changes: 12 additions & 12 deletions src/test/suite/utils/getRestoreCacheCommand.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@ suite('getRestoreCacheCommand', () => {
`restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.npm")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1) echo "Restoring cached directory $verified_directory";
verified_directory=$(find $directory_candidate | tail -n1) echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;
done
restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.cache")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;`
done`
)
);
});
Expand Down Expand Up @@ -81,25 +81,25 @@ suite('getRestoreCacheCommand', () => {
`restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.npm" "/tmp/local-ci/v2-deps*/.npm")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;
done
restore_from_directories=("/tmp/local-ci/v2-deps-$( if [ -f "package-lock.json" ]; then (shasum "package-lock.json" 2>/dev/null || sha256sum "package-lock.json" 2>/dev/null) | awk '{print $1}'; fi )*/.cache" "/tmp/local-ci/v2-deps*/.cache")
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ~ || cp -ru $verified_directory ~;
break;
fi
done;`
done`
)
);
});
Expand Down
6 changes: 3 additions & 3 deletions src/utils/getRestoreCacheCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ export default function getRestoreCacheCommand(
.join(' ')})
for directory_candidate in $restore_from_directories
do
if [ $(ls -ard $directory_candidate 2>/dev/null) ]
if [ "$(find $directory_candidate 2>/dev/null)" ]
then
verified_directory=$(ls -ard $directory_candidate | tail -n1)
verified_directory=$(find $directory_candidate | tail -n1)
echo "Restoring cached directory $verified_directory";
cp -rn $verified_directory ${dirname} || cp -ru $verified_directory ${dirname};
break;
fi
done;\n`;
done \n`;
}, '');
}
7 changes: 7 additions & 0 deletions src/utils/listenToJob.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,13 @@ export default function listenToJob(
);
}

if (output?.includes('error while creating mount source path')) {
vscode.window.showErrorMessage(
`Restarting Docker Desktop should fix that error 'error while creating mount source path', though that's not fun`,
{ detail: 'Possible solution' }
);
}

if (output?.includes('compinit: insecure directories')) {
const possibleSolutionText = 'See a possible solution';
vscode.window
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载