Skip to content

Commit

Permalink
fix: Fixing some problems with drupal multiversion and verbose output…
Browse files Browse the repository at this point in the history
… on install
  • Loading branch information
juanjol committed Dec 11, 2024
1 parent 1aec4ff commit 3131962
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 20 deletions.
13 changes: 4 additions & 9 deletions commands/host/aljibe-kickstart
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#!/bin/bash
#ddev-generated
## Description: Copy kickstar files to the project root
## Usage: aljibe-kickstart
## Usage: aljibe-kickstart [options]
## Flags: [{"Name":"noinstall","Usage":"setup --noinstall"}]
## Example: ddev aljibe-kickstart

DRUPAL_VERSION=d11
PROJECT_TYPE=drupal11
AUTO_CONFIRM=false

# Check if ${DDEV_APPROOT}/.ddev/kickstart/ exists, if not show a warning and exit
Expand All @@ -18,7 +17,6 @@ if [ ! -d "${DDEV_APPROOT}/.ddev/kickstart" ]; then
exit 1
fi


while (( "$#" )); do
case "$1" in
-y|--yes)
Expand All @@ -27,7 +25,6 @@ while (( "$#" )); do
;;
d10)
DRUPAL_VERSION=d10
PROJECT_TYPE=drupal10
shift
;;
*)
Expand All @@ -45,10 +42,8 @@ fi

if [ "$CONFIRMATION" != "n" ]; then
cp -rTf ${DDEV_APPROOT}/.ddev/kickstart/common ${DDEV_APPROOT}
cp -rTf ${DDEV_APPROOT}/.ddev/kickstart/common/${DRUPAL_VERSION} ${DDEV_APPROOT}
rm -fR ${DDEV_APPROOT}/.ddev/kickstart
ddev config --project-type=${PROJECT_TYPE} --docroot=web
echo "Kickstart files have been copied."
cp -rTf ${DDEV_APPROOT}/.ddev/kickstart/${DRUPAL_VERSION} ${DDEV_APPROOT}
echo "Kickstart files have been copied. Make sure yout .gitignore file ignores .ddev/kickstart directory."
else
echo "Operation cancelled."
echo "Kickstart operation cancelled."
fi
2 changes: 1 addition & 1 deletion install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description:
project_files:
- commands
- scripts
- aljibe-kickstart
- kickstart
- aljibe.yaml.example
- site-profiles
- config.aljibe.yaml
Expand Down
11 changes: 6 additions & 5 deletions kickstart/d10/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,16 @@
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"drupal/core-composer-scaffold": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpstan/extension-installer": true,
"phpro/grumphp": true,
"metadrop/backstopjs-addons": true,
"drupal/core-composer-scaffold": true,
"liborm85/composer-vendor-cleaner": true,
"metadrop/backstopjs-addons": true,
"metadrop/composer-comments": true,
"mxr576/ddqg-composer-audit": true,
"php-http/discovery": true,
"liborm85/composer-vendor-cleaner": true
"phpro/grumphp": true,
"phpstan/extension-installer": true,
"tbachert/spi": true
}
},
"scripts": {
Expand Down
6 changes: 2 additions & 4 deletions scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ fi
# Function to check if an addon is installed
check_addon_installed() {
if ddev add-on list --installed --skip-hooks | grep -i "$1" -q; then
echo "** $1 ound"
return 1 # Found
else
echo "XX $1 not found"
return 0 # Not found
fi
}
Expand All @@ -37,10 +35,10 @@ install_addon() {

# Install if Aljibe is not installed (ALJIBE_INSTALLED=0), or if both Aljibe and the addon are installed
if [ "$ALJIBE_INSTALLED" -eq 0 ] || ([ "$ALJIBE_INSTALLED" -eq 1 ] && ! check_addon_installed "$addon_name"); then
echo "**** Installing $addon_name..."
echo "**** $addon_name found. Installing/Updating it."
ddev add-on get "$addon_path"
else
echo "XXXX Skipping $addon_name installation"
echo "XXXX $addon_name not found. Skipping installation."
fi
}

Expand Down
1 change: 0 additions & 1 deletion site-profiles
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash


## *** DO NOT REMOVE THIS FILE ***
## This is an auxiliary file for site installation in Aljibe.
## It is responsible for setting the DRUPAL_PROFILE variable based on
Expand Down

0 comments on commit 3131962

Please sign in to comment.