Compatibility between docker-compose and docker compose

doli

@@ -53,12 +53,17 @@ usage() {
 }
 
 if [ "$(is_docker)" -eq 1 ]; then
-	cmd="docker-compose exec $APP_SERVICE"
-    cmdmy="docker-compose exec $DB_SERVICE"
-    cmdmyInput="docker exec -i $(docker-compose ps -q $DB_SERVICE)"
-    cmdrestart="docker-compose restart"
-    cmdup="docker-compose up"
-    cmddown="docker-compose down"
+	if [ -z "$(which docker-compose)" ]; then
+		compose="docker compose"
+	else
+		compose="docker-compose"
+	fi
+	cmd="$compose exec $APP_SERVICE"
+    cmdmy="$compose exec $DB_SERVICE"
+    cmdmyInput="docker exec -i $($compose ps -q $DB_SERVICE)"
+    cmdrestart="$compose restart"
+    cmdup="$compose up"
+    cmddown="$compose down"
 else
     cmdrestart="apache2ctl restart" 
 fi
@@ -142,7 +147,7 @@ case $action in
         ;;
     "shell")
 		if [ $(is_docker) -eq 1 ]; then
-			docker cp doli_shell.php $(docker-compose ps -q $APP_SERVICE):/var/www
+			docker cp doli_shell.php $($compose ps -q $APP_SERVICE):/var/www
 		fi
 		$cmd php -a -d auto_prepend_file=/var/www/doli_shell.php
         ;;