Commit 8a73d26c authored by Aral Balkan's avatar Aral Balkan

Now only forking if fork was selected. Minor display updates to status messages.

parent a5c622a2
......@@ -198,8 +198,10 @@ indentOutput(){
#
installEverything(){
echo "\nForking."
forkEverything
if [ $optionForkFirst = true ]; then
echo "\nForking…"
forkEverything
fi
echo "\nInstalling everything."
......@@ -211,8 +213,10 @@ installEverything(){
}
installInspector(){
echo "\nForking inspector (and builder)."
forkInspector
if [ $optionForkFirst = true ]; then
echo "\nForking inspector (and builder)…"
forkInspector
fi
echo "\nInstalling inspector."
install "inspector" "Better Inspector"
......@@ -228,14 +232,14 @@ install(){
# Check if a Better Builder installation exists.
if [ -d componentToInstall ]; then
echo " · Existing ${humanName} found. Skipping installation."
echo " Existing ${humanName} found. Skipping installation."
return 0
fi
echo "\n · Cloning ${humanName}…"
echo "\n Cloning ${humanName}…"
git clone --quiet git@source.ind.ie:better/${componentToInstall}.git
echo "\n · Running installation script for ${humanName}…"
echo "\n Running installation script for ${humanName}…"
cd $componentToInstall
indentOutput "./install" ' '
cd ..
......@@ -243,7 +247,7 @@ install(){
# Check that the installation completed successfully
if [ -f "/tmp/better.fyi.${componentToInstall}.installation.is.incomplete" ]; then
# Error
echo " · Error: ${humanName} installation was interrupted. Exiting."
echo " Error: ${humanName} installation was interrupted. Exiting."
exit 1
fi
......@@ -261,14 +265,13 @@ fork(){
# Check if a Better Builder installation exists.
if [ -d componentToInstall ]; then
echo " · Existing ${humanName} found locally. Skipping fork."
echo " Existing ${humanName} found locally. Skipping fork."
return 0
fi
echo "\n · Forking ${humanName}…"
echo "\n Forking ${humanName}…"
forkResult=$(curl --silent --header "PRIVATE-TOKEN: ${privateToken}" -X POST https://source.ind.ie/api/v3/projects/fork/${projectID})
echo "Fork result: ${forkResult}"
}
#
......@@ -284,7 +287,7 @@ forkInspector(){
#
forkEverything(){
fork "app" "Better iOS App" "107"
forkTheInspector
forkInspector
fork "safari" "Better Safari Extension" "152"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment