ci: Always reset the skeleton directory

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Oct 21, 2024 · 8db7179 · 8db7179
1 parent b0d2e6e
commit 8db7179
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/tests/integration/run.sh b/tests/integration/run.sh
@@ -92,7 +92,7 @@ export NEXTCLOUD_CONFIG_DIR="$MAIN_SERVER_CONFIG_DIR"
 MAIN_OVERWRITE_CLI_URL=$(${ROOT_DIR}/occ config:system:get overwrite.cli.url)
 MAIN_SKELETON_DIR=$(${ROOT_DIR}/occ config:system:get skeletondirectory)
 ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "http://localhost:8080/"
-if [[ "$MAIN_SKELETON_DIR" != "" && -d $MAIN_SKELETON_DIR ]]; then
+if [[ "$MAIN_SKELETON_DIR" != "" ]]; then
 	echo "Resetting custom skeletondirectory so that tests pass"
 	${ROOT_DIR}/occ config:system:delete skeletondirectory
 fi
@@ -101,7 +101,7 @@ export NEXTCLOUD_CONFIG_DIR="$REAL_FEDERATED_SERVER_CONFIG_DIR"
 REAL_FEDERATED_OVERWRITE_CLI_URL=$(${ROOT_DIR}/occ config:system:get overwrite.cli.url)
 REAL_FEDERATED_SKELETON_DIR=$(${ROOT_DIR}/occ config:system:get skeletondirectory)
 ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "$TEST_REMOTE_URL"
-if [[ "$REAL_FEDERATED_SKELETON_DIR" != "" && -d $REAL_FEDERATED_SKELETON_DIR ]]; then
+if [[ "$REAL_FEDERATED_SKELETON_DIR" != "" ]]; then
 	echo "Resetting custom skeletondirectory so that tests pass"
 	${ROOT_DIR}/occ config:system:delete skeletondirectory
 fi
@@ -198,18 +198,18 @@ echo -e "\033[0;36m#\033[0m"
 export NEXTCLOUD_CONFIG_DIR="$MAIN_SERVER_CONFIG_DIR"
 ${ROOT_DIR}/occ app:disable spreedcheats
 ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "$MAIN_OVERWRITE_CLI_URL"
-if [[ "$MAIN_SKELETON_DIR" != "" && -d $MAIN_SKELETON_DIR ]]; then
+if [[ "$MAIN_SKELETON_DIR" != "" ]]; then
 	${ROOT_DIR}/occ config:system:set skeletondirectory --value "$MAIN_SKELETON_DIR"
 fi
 
 # Real federated server
 if $DESTROY_REAL_FEDERATED_SERVER; then
-	rm -rf "'$REAL_FEDERATED_SERVER_CONFIG_DIR'" "'$REAL_FEDERATED_SERVER_DATA_DIR'"
+	rm -rf "$REAL_FEDERATED_SERVER_CONFIG_DIR" "$REAL_FEDERATED_SERVER_DATA_DIR"
 else
 	export NEXTCLOUD_CONFIG_DIR="$REAL_FEDERATED_SERVER_CONFIG_DIR"
 	${ROOT_DIR}/occ app:disable spreedcheats
 	${ROOT_DIR}/occ config:system:set overwrite.cli.url --value "$REAL_FEDERATED_OVERWRITE_CLI_URL"
-	if [[ "$REAL_FEDERATED_SKELETON_DIR" != "" && -d $REAL_FEDERATED_SKELETON_DIR ]]; then
+	if [[ "$REAL_FEDERATED_SKELETON_DIR" != "" ]]; then
 		${ROOT_DIR}/occ config:system:set skeletondirectory --value "$REAL_FEDERATED_SKELETON_DIR"
 	fi
 fi