fix gel cli tests

Author: joshuanianji

src/gel-cli/install.sh

@@ -73,13 +73,15 @@ export DEBIAN_FRONTEND=noninteractive
 
 check_packages curl ca-certificates
 
+# Looks like they kept the config directories the same (edgedb in the paths)
+
 # cache data directory
 create_cache_dir "/dc/gel-cli/data" "${USERNAME}"
-create_symlink_dir "$_REMOTE_USER_HOME/.local/share/gel" "/dc/gel-cli/data" "${USERNAME}"
+create_symlink_dir "$_REMOTE_USER_HOME/.local/share/edgedb" "/dc/gel-cli/data" "${USERNAME}"
 
 # cache config directory
 create_cache_dir "/dc/gel-cli/config" "${USERNAME}"
-create_symlink_dir "$_REMOTE_USER_HOME/.config/gel" "/dc/gel-cli/config" "${USERNAME}"
+create_symlink_dir "$_REMOTE_USER_HOME/.config/edgedb" "/dc/gel-cli/config" "${USERNAME}"
 
 install_cli "${USERNAME}"
 

test/gel-cli/_default.sh

@@ -11,9 +11,11 @@ source dev-container-features-test-lib
 # check that the command is available
 check "help" bash -c "gel --help | grep 'Usage'"
 
+gel info
+
 # make sure gel directories match up with our expectations
-check "gel cli data dir" bash -c "test \"$(gel info --get data-dir)\" = $HOME/.local/share/gel/data/"
-check "gel cli config dir" bash -c "test \"$(gel info --get config-dir)\" = $HOME/.config/gel/"
+check "gel info data dir" bash -c "test \"$(gel info --get data-dir)\" = $HOME/.local/share/edgedb/data/"
+check "gel info config dir" bash -c "test \"$(gel info --get config-dir)\" = $HOME/.config/edgedb/"
 
 # check that data directories exist
 check "~/.local/share/gel exists" bash -c "ls -la ~/.local/share | grep 'gel'"
@@ -26,12 +28,12 @@ check "/dc/gel-cli exists" bash -c "ls -la /dc/gel-cli | grep 'config'"
 # check that the folders are owned by the user
 # https://askubuntu.com/a/175060
 # $USER is empty when running as root, so we use $(whoami)
-echo "Checking ownership of ~/.local/share/gel/data and /dc/gel-cli/data (ensure it is owned by $(whoami))"
+echo "Checking ownership of ~/.local/share/edgedb/data and /dc/gel-cli/data (ensure it is owned by $(whoami))"
 
-check "~/.local/share/gel owned by user" bash -c "test \"$(stat -c "%U" ~/.local/share/gel)\" = $(whoami)"
+check "~/.local/share/edgedb owned by user" bash -c "test \"$(stat -c "%U" ~/.local/share/edgedb)\" = $(whoami)"
 check "/dc/gel-cli/data owned by user" bash -c "test \"$(stat -c "%U" /dc/gel-cli/data)\" = $(whoami)"
 
-check "~/.config/gel owned by user" bash -c "test \"$(stat -c "%U" ~/.config/gel)\" = $(whoami)"
+check "~/.config/edgedb owned by user" bash -c "test \"$(stat -c "%U" ~/.config/edgedb)\" = $(whoami)"
 check "/dc/gel-cli/config owned by user" bash -c "test \"$(stat -c "%U" /dc/gel-cli/config)\" = $(whoami)"
 
 # Report result