Skip to content

Commit 8cfeaa4

Browse files
committed
Install composer v1 by default
Switching to v2 can be done by running https://blog.packagist.com/composer-2-0-is-now-available/
1 parent cfaad77 commit 8cfeaa4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

bin/v-add-user-composer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if [[ "$signature" != $(sha384sum $COMPOSER_SETUP_FILE | cut -f 1 -d " ") ]]; th
7373
check_result $E_INVALID "Composer signature does not match"
7474
fi
7575

76-
COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php "$COMPOSER_SETUP_FILE" --quiet --install-dir="$COMPOSER_DIR" --filename=composer
76+
COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php "$COMPOSER_SETUP_FILE" --1 --quiet --install-dir="$COMPOSER_DIR" --filename=composer
7777
check_result $? "Composer install failed"
7878

7979
[ -f "$COMPOSER_SETUP_FILE" ] && rm -f "$COMPOSER_SETUP_FILE"

web/src/app/System/HestiaApp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function installComposer()
6969
}
7070

7171
$install_folder = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.composer';
72-
$this->runUser('v-run-cli-cmd', ["/usr/bin/php", $composer_setup, "--quiet", "--install-dir=".$install_folder, "--filename=composer" ], $status);
72+
$this->runUser('v-run-cli-cmd', ["/usr/bin/php", $composer_setup, "--1", "--quiet", "--install-dir=".$install_folder, "--filename=composer" ], $status);
7373

7474
unlink($composer_setup);
7575

0 commit comments

Comments
 (0)