File tree Expand file tree Collapse file tree 2 files changed +19
-7
lines changed
Expand file tree Collapse file tree 2 files changed +19
-7
lines changed Original file line number Diff line number Diff line change @@ -73,8 +73,14 @@ export DEBIAN_FRONTEND=noninteractive
7373
7474check_packages curl ca-certificates
7575
76- create_cache_dir " /dc/edgedb-cli" " ${USERNAME} "
77- create_symlink_dir " $_REMOTE_USER_HOME /.local/share/edgedb" " /dc/edgedb-cli" " ${USERNAME} "
76+ # cache data directory
77+ create_cache_dir " /dc/edgedb-cli/data" " ${USERNAME} "
78+ create_symlink_dir " $_REMOTE_USER_HOME /.local/share/edgedb" " /dc/edgedb-cli/data" " ${USERNAME} "
79+
80+ # cache config directory
81+ create_cache_dir " /dc/edgedb-cli/config" " ${USERNAME} "
82+ create_symlink_dir " $_REMOTE_USER_HOME /.config/edgedb" " /dc/edgedb-cli/config" " ${USERNAME} "
83+
7884install_edgedb " ${USERNAME} "
7985
8086# Set Lifecycle scripts
Original file line number Diff line number Diff line change @@ -11,17 +11,23 @@ source dev-container-features-test-lib
1111# check that the command is available
1212check " help" bash -c " edgedb --help | grep 'Usage'"
1313
14- # check that `.config/gh` and `/dc/github-cli` exist under the user (should be node)
14+ # check that data directories exist
1515check " ~/.local/share/edgedb exists" bash -c " ls -la ~/.local/share | grep 'edgedb'"
16- check " /dc/edgedb-cli exists" bash -c " ls -la /dc | grep 'edgedb-cli'"
16+ check " /dc/edgedb-cli/data exists" bash -c " ls -la /dc/edgedb-cli | grep 'data'"
17+
18+ # check that config directories exist
19+ check " ~/.config/edgedb exists" bash -c " ls -la ~/.config | grep 'edgedb'"
20+ check " /dc/edgedb-cli exists" bash -c " ls -la /dc/edgedb-cli | grep 'config'"
1721
1822# check that the folders are owned by the user
1923# https://askubuntu.com/a/175060
20- echo " Checking ownership of ~/.local/share/edgedb and /dc/edgedb-cli (ensure it is owned by $USER )"
21- ls -al ~ /.local/share/
24+ echo " Checking ownership of ~/.local/share/edgedb/data and /dc/edgedb-cli/data (ensure it is owned by $USER )"
2225
2326check " ~/.local/share/edgedb owned by user" bash -c " test \" $( stat -c " %U" ~ /.local/share/edgedb) \" = $USER "
24- check " /dc/edgedb-cli owned by user" bash -c " test \" $( stat -c " %U" /dc/edgedb-cli) \" = $USER "
27+ check " /dc/edgedb-cli/data owned by user" bash -c " test \" $( stat -c " %U" /dc/edgedb-cli/data) \" = $USER "
28+
29+ check " ~/.config/edgedb owned by user" bash -c " test \" $( stat -c " %U" ~ /.config/edgedb) \" = $USER "
30+ check " /dc/edgedb-cli/config owned by user" bash -c " test \" $( stat -c " %U" /dc/edgedb-cli/config) \" = $USER "
2531
2632# Report result
2733reportResults
You can’t perform that action at this time.
0 commit comments