Commit 767ed2a8 authored by Pol Dellaiera's avatar Pol Dellaiera
Browse files

build-support/php: make shellcheck happy

parent bb0c422e

pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh

+7 −4
Original line number Diff line number Diff line 
declare -g version

# shellcheck shell=bash



declare -g out

declare -g pname

declare -g composerVendor

declare -g -i composerStrictValidation="${composerStrictValidation:-0}"
@@ -8,6 +10,7 @@ preBuildHooks+=(composerInstallBuildHook) 
preCheckHooks+=(composerInstallCheckHook)

preInstallHooks+=(composerInstallInstallHook)



# shellcheck source=/dev/null

source @phpScriptUtils@



composerInstallConfigureHook() {
@@ -20,10 +23,10 @@ composerInstallConfigureHook() { 
    exit 1

  fi



  install -Dm644 ${composerVendor}/composer.json .

  install -Dm644 "${composerVendor}"/composer.json .



  if [[ -f "${composerVendor}/composer.lock" ]]; then

    install -Dm644 ${composerVendor}/composer.lock .

    install -Dm644 "${composerVendor}"/composer.lock .

  fi



  if [[ -f "composer.lock" ]]; then
@@ -52,7 +55,7 @@ composerInstallCheckHook() { 
composerInstallInstallHook() {

  echo "Executing composerInstallInstallHook"



  cp -ar ${composerVendor}/* .

  cp -ar "${composerVendor}"/* .



  # Copy the relevant files only in the store.

  mkdir -p "$out"/share/php/"${pname}"

pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh

+18 −13
Original line number Diff line number Diff line 
# shellcheck shell=bash



# shellcheck source=/dev/null

source @phpScriptUtils@



declare -g out

declare -g composerLock

declare -g composerNoDev="${composerNoDev:+--no-dev}"

declare -g composerNoPlugins="${composerNoPlugins:+--no-plugins}"

declare -g composerNoScripts="${composerNoScripts:+--no-scripts}"
@@ -20,7 +25,7 @@ composerVendorConfigureHook() { 


  if [[ -e "$composerLock" ]]; then

    echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m"

    install -Dm644 $composerLock ./composer.lock

    install -Dm644 "$composerLock" ./composer.lock

  fi



  if [[ ! -f "composer.lock" ]]; then
@@ -30,13 +35,13 @@ composerVendorConfigureHook() { 
      --no-interaction \

      --no-progress \

      --optimize-autoloader \

      ${composerNoDev} \

      ${composerNoPlugins} \

      ${composerNoScripts} \

      "${composerNoDev}" \

      "${composerNoPlugins}" \

      "${composerNoScripts}" \

      update



    if [[ -f "composer.lock" ]]; then

      install -Dm644 composer.lock -t $out/

      install -Dm644 composer.lock -t "$out"/



      echo

      echo -e "\e[31mERROR: No composer.lock found\e[0m"
@@ -74,9 +79,9 @@ composerVendorBuildHook() { 
    --no-interaction \

    --no-progress \

    --optimize-autoloader \

    ${composerNoDev} \

    ${composerNoPlugins} \

    ${composerNoScripts} \

    "${composerNoDev}" \

    "${composerNoPlugins}" \

    "${composerNoScripts}" \

    install



  echo "Finished composerVendorBuildHook"
@@ -93,9 +98,9 @@ composerVendorCheckHook() { 
composerVendorInstallHook() {

  echo "Executing composerVendorInstallHook"



  mkdir -p $out

  mkdir -p "$out"



  cp -ar composer.json $(composer config vendor-dir) $out/

  cp -ar composer.json "$(composer config vendor-dir)" "$out"/

  mapfile -t installer_paths < <(jq -r -c 'try((.extra."installer-paths") | keys[])' composer.json)



  for installer_path in "${installer_paths[@]}"; do
@@ -104,16 +109,16 @@ composerVendorInstallHook() { 
    out_installer_path="$out/${installer_path/\{\$name\}*/}"

    # Copy the installer path if it exists

    if [[ -d "$installer_path" ]]; then

      mkdir -p $(dirname "$out_installer_path")

      mkdir -p "$(dirname "$out_installer_path")"

      echo -e "\e[32mCopying installer path $installer_path to $out_installer_path\e[0m"

      cp -ar "$installer_path" "$out_installer_path"

      # Strip out the git repositories

      find $out_installer_path -name .git -type d -prune -print -exec rm -rf {} ";"

      find "$out_installer_path" -name .git -type d -prune -print -exec rm -rf {} ";"

    fi

  done



  if [[ -f "composer.lock" ]]; then

    cp -ar composer.lock $out/

    cp -ar composer.lock "$out"/

  fi



  echo "Finished composerVendorInstallHook"

pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash

+2 −0
Original line number Diff line number Diff line 
# shellcheck shell=bash



declare -g version

declare -g -i composerStrictValidation="${composerStrictValidation:-0}"