mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
build-support/php: fix typo
This commit is contained in:
parent
07e6929c81
commit
95f5cf75d3
7 changed files with 15 additions and 15 deletions
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -28,7 +28,7 @@ composerWithPluginConfigureHook() {
|
|||
cp -ar $src $out/src
|
||||
|
||||
if [[ ! -f "$out/composer.lock" ]]; then
|
||||
setComposeRootVersion
|
||||
setComposerRootVersion
|
||||
|
||||
composer \
|
||||
global \
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -14,7 +14,7 @@ source @phpScriptUtils@
|
|||
composerInstallConfigureHook() {
|
||||
echo "Executing composerInstallConfigureHook"
|
||||
|
||||
setComposeRootVersion
|
||||
setComposerRootVersion
|
||||
|
||||
if [[ ! -e "${composerVendor}" ]]; then
|
||||
echo "No local composer vendor found."
|
||||
|
|
|
@ -15,7 +15,7 @@ source @phpScriptUtils@
|
|||
composerVendorConfigureHook() {
|
||||
echo "Executing composerVendorConfigureHook"
|
||||
|
||||
setComposeRootVersion
|
||||
setComposerRootVersion
|
||||
|
||||
if [[ -e "$composerLock" ]]; then
|
||||
echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m"
|
||||
|
@ -59,7 +59,7 @@ composerVendorConfigureHook() {
|
|||
composerVendorBuildHook() {
|
||||
echo "Executing composerVendorBuildHook"
|
||||
|
||||
setComposeEnvVariables
|
||||
setComposerEnvVariables
|
||||
|
||||
composer \
|
||||
`# The acpu-autoloader is not reproducible and has to be disabled.` \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue