File tree Expand file tree Collapse file tree 7 files changed +15
-15
lines changed
pkgs/build-support/php/builders Expand file tree Collapse file tree 7 files changed +15
-15
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ composerInstallConfigureHook() {
2424 fi
2525
2626 if [[ ! -f " composer.lock" ]]; then
27- setComposeRootVersion
27+ setComposerRootVersion
2828
2929 composer \
3030 --no-install \
@@ -79,7 +79,7 @@ composerInstallConfigureHook() {
7979composerInstallBuildHook () {
8080 echo " Executing composerInstallBuildHook"
8181
82- setComposeRootVersion
82+ setComposerRootVersion
8383
8484 # Since this file cannot be generated in the composer-repository-hook.sh
8585 # because the file contains hardcoded nix store paths, we generate it here.
@@ -99,8 +99,8 @@ composerInstallCheckHook() {
9999composerInstallInstallHook () {
100100 echo " Executing composerInstallInstallHook"
101101
102- setComposeRootVersion
103- setComposeEnvVariables
102+ setComposerRootVersion
103+ setComposerEnvVariables
104104
105105 # Finally, run `composer install` to install the dependencies and generate
106106 # the autoloader.
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ composerRepositoryConfigureHook() {
2020 fi
2121
2222 if [[ ! -f " composer.lock" ]]; then
23- setComposeRootVersion
23+ setComposerRootVersion
2424
2525 composer \
2626 --no-install \
@@ -58,7 +58,7 @@ composerRepositoryBuildHook() {
5858
5959 mkdir -p repository
6060
61- setComposeRootVersion
61+ setComposerRootVersion
6262
6363 # Build the local composer repository
6464 # The command 'build-local-repo' is provided by the Composer plugin
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ composerWithPluginConfigureHook() {
2828 cp -ar $src $out /src
2929
3030 if [[ ! -f " $out /composer.lock" ]]; then
31- setComposeRootVersion
31+ setComposerRootVersion
3232
3333 composer \
3434 global \
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ declare version
22declare composerStrictValidation
33declare composerGlobal
44
5- setComposeRootVersion () {
5+ setComposerRootVersion () {
66 set +e # Disable exit on error
77
88 if [[ -v version ]]; then
@@ -13,15 +13,15 @@ setComposeRootVersion() {
1313 set -e
1414}
1515
16- setComposeEnvVariables () {
16+ setComposerEnvVariables () {
1717 echo -e " \e[32mSetting some required environment variables for Composer...\e[0m"
1818 export COMPOSER_MIRROR_PATH_REPOS=1
1919 export COMPOSER_CACHE_DIR=/dev/null
2020 export COMPOSER_HTACCESS_PROTECT=0
2121}
2222
2323checkComposerValidate () {
24- setComposeRootVersion
24+ setComposerRootVersion
2525
2626 if [ " 1" == " ${composerGlobal-} " ]; then
2727 global=" global" ;
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ source @phpScriptUtils@
1414composerInstallConfigureHook () {
1515 echo " Executing composerInstallConfigureHook"
1616
17- setComposeRootVersion
17+ setComposerRootVersion
1818
1919 if [[ ! -e " ${composerVendor} " ]]; then
2020 echo " No local composer vendor found."
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ source @phpScriptUtils@
1515composerVendorConfigureHook () {
1616 echo " Executing composerVendorConfigureHook"
1717
18- setComposeRootVersion
18+ setComposerRootVersion
1919
2020 if [[ -e " $composerLock " ]]; then
2121 echo -e " \e[32mUsing user provided \` composer.lock\` file from \` $composerLock \` \e[0m"
@@ -59,7 +59,7 @@ composerVendorConfigureHook() {
5959composerVendorBuildHook () {
6060 echo " Executing composerVendorBuildHook"
6161
62- setComposeEnvVariables
62+ setComposerEnvVariables
6363
6464 composer \
6565 ` # The acpu-autoloader is not reproducible and has to be disabled.` \
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ declare version
22declare composerStrictValidation
33declare composerGlobal
44
5- setComposeRootVersion () {
5+ setComposerRootVersion () {
66 set +e # Disable exit on error
77
88 if [[ -v version ]]; then
@@ -13,7 +13,7 @@ setComposeRootVersion() {
1313 set -e
1414}
1515
16- setComposeEnvVariables () {
16+ setComposerEnvVariables () {
1717 echo -e " \e[32mSetting some required environment variables for Composer...\e[0m"
1818 export COMPOSER_MIRROR_PATH_REPOS=1
1919 export COMPOSER_CACHE_DIR=/dev/null
You can’t perform that action at this time.
0 commit comments