Unverified Commit 95f5cf75 authored by Pol Dellaiera's avatar Pol Dellaiera
Browse files

build-support/php: fix typo

parent 07e6929c

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

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ composerInstallConfigureHook() { 
    fi



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

        setComposeRootVersion

        setComposerRootVersion



        composer \

            --no-install \
@@ -79,7 +79,7 @@ composerInstallConfigureHook() { 
composerInstallBuildHook() {

    echo "Executing composerInstallBuildHook"



    setComposeRootVersion

    setComposerRootVersion



    # Since this file cannot be generated in the composer-repository-hook.sh

    # because the file contains hardcoded nix store paths, we generate it here.
@@ -99,8 +99,8 @@ composerInstallCheckHook() { 
composerInstallInstallHook() {

    echo "Executing composerInstallInstallHook"



    setComposeRootVersion

    setComposeEnvVariables

    setComposerRootVersion

    setComposerEnvVariables



    # Finally, run `composer install` to install the dependencies and generate

    # the autoloader.

pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ composerRepositoryConfigureHook() { 
    fi



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

        setComposeRootVersion

        setComposerRootVersion



        composer \

            --no-install \
@@ -58,7 +58,7 @@ composerRepositoryBuildHook() { 


    mkdir -p repository



    setComposeRootVersion

    setComposerRootVersion



    # Build the local composer repository

    # The command 'build-local-repo' is provided by the Composer plugin

pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ composerWithPluginConfigureHook() { 
    cp -ar $src $out/src



    if [[ ! -f "$out/composer.lock" ]]; then

        setComposeRootVersion

        setComposerRootVersion



        composer \

            global \

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

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ declare version 
declare composerStrictValidation

declare composerGlobal



setComposeRootVersion() {

setComposerRootVersion() {

    set +e # Disable exit on error



    if [[ -v version ]]; then
@@ -13,7 +13,7 @@ setComposeRootVersion() { 
    set -e

}



setComposeEnvVariables() {

setComposerEnvVariables() {

    echo -e "\e[32mSetting some required environment variables for Composer...\e[0m"

    export COMPOSER_MIRROR_PATH_REPOS=1

    export COMPOSER_CACHE_DIR=/dev/null
@@ -21,7 +21,7 @@ setComposeEnvVariables() { 
}



checkComposerValidate() {

    setComposeRootVersion

    setComposerRootVersion



    if [ "1" == "${composerGlobal-}" ]; then

      global="global";

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ source @phpScriptUtils@ 
composerInstallConfigureHook() {

    echo "Executing composerInstallConfigureHook"



    setComposeRootVersion

    setComposerRootVersion



    if [[ ! -e "${composerVendor}" ]]; then

        echo "No local composer vendor found."