forked from Ivasoft/mattermost-mobile
Remove output redirection to resolve stuck behavior in pod-install (#7393)
* Update postinstall.sh * rev comments * Update package-lock.json * update --------- Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
@@ -37,18 +37,18 @@ function ipa() {
|
||||
esac
|
||||
}
|
||||
|
||||
function ios() {
|
||||
function installGemsAndPods() {
|
||||
echo "Installing Gems"
|
||||
npm run ios-gems &> /dev/null
|
||||
npm run ios-gems
|
||||
echo "Getting Cocoapods dependencies"
|
||||
npm run pod-install &> /dev/null
|
||||
npm run pod-install
|
||||
}
|
||||
|
||||
function iosM1() {
|
||||
function installGemsAndPodsM1() {
|
||||
echo "Installing Gems"
|
||||
npm run ios-gems-m1 &> /dev/null || exit 1
|
||||
npm run ios-gems-m1
|
||||
echo "Getting Cocoapods dependencies"
|
||||
npm run pod-install-m1 &> /dev/null || exit 1
|
||||
npm run pod-install-m1
|
||||
}
|
||||
|
||||
function setup() {
|
||||
@@ -60,9 +60,9 @@ function setup() {
|
||||
|
||||
if [[ "$1" == "ios"* ]]; then
|
||||
if [[ $(uname -p) == 'arm' ]]; then
|
||||
iosM1 || exit 1
|
||||
installGemsAndPodsM1 || exit 1
|
||||
else
|
||||
ios || exit 1
|
||||
installGemsAndPods || exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
function ios() {
|
||||
function installPods() {
|
||||
echo "Getting Cocoapods dependencies"
|
||||
npm run pod-install &> /dev/null
|
||||
npm run pod-install
|
||||
}
|
||||
|
||||
function iosM1() {
|
||||
function installPodsM1() {
|
||||
echo "Getting Cocoapods dependencies"
|
||||
npm run pod-install-m1 &> /dev/null
|
||||
npm run pod-install-m1
|
||||
}
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
if [[ $(uname -p) == 'arm' ]]; then
|
||||
iosM1
|
||||
installPodsM1
|
||||
else
|
||||
ios
|
||||
installPods
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user