Don't include SPC into Mac releases

Author: shiroyasha

install-toolbox

@@ -105,29 +105,30 @@ else
   echo "toolbox_install_error{module='artifacts'} 1" >> /tmp/toolbox_metrics
 fi
 
+if [[ `uname` != "Darwin" ]]; then
 
-echo "Installing the artifacts CLI"
-install_cmd mv ~/.toolbox/spc $INSTALL_PATH/spc
-install_cmd chmod +x $INSTALL_PATH/spc
-if [[ $? -eq 0 ]];then
-  echo "spc installed"
-else
-  echo "toolbox_install_error{module='spc'} 1" >> /tmp/toolbox_metrics
-fi
-
-echo "Installing the when CLI"
-install_cmd mv ~/.toolbox/when $INSTALL_PATH/when
-install_cmd chmod +x $INSTALL_PATH/when
-if [[ $? -eq 0 ]];then
-  echo "when installed"
-else
-  echo "toolbox_install_error{module='when'} 1" >> /tmp/toolbox_metrics
-fi
+  echo "Installing the SPC CLI"
+  install_cmd mv ~/.toolbox/spc $INSTALL_PATH/spc
+  install_cmd chmod +x $INSTALL_PATH/spc
+  if [[ $? -eq 0 ]];then
+    echo "spc installed"
+  else
+    echo "toolbox_install_error{module='spc'} 1" >> /tmp/toolbox_metrics
+  fi
 
+  echo "Installing the when CLI"
+  install_cmd mv ~/.toolbox/when $INSTALL_PATH/when
+  install_cmd chmod +x $INSTALL_PATH/when
+  if [[ $? -eq 0 ]];then
+    echo "when installed"
+  else
+    echo "toolbox_install_error{module='when'} 1" >> /tmp/toolbox_metrics
+  fi
 
-if [[ `uname` != "Darwin" ]]; then
   echo "Starting to collect System Metrics in /tmp/system-metrics"
-  sh ~/.toolbox/system-metrics-collector & # failure won't be propagated to the caller in case of using &
+
+  # failure won't be propagated to the caller in case of using &
+  sh ~/.toolbox/system-metrics-collector &
 fi
 
 echo "toolbox_install_total 1" >> /tmp/toolbox_metrics

release/create.sh

@@ -56,21 +56,17 @@ cd /tmp/Darwin && tar -zxf artifact_Darwin.tar.gz && mv artifact toolbox/ && cd
 echo "Download When CLI"
 
 curl -s -L --retry 5 $WHEN_CLI_URL/when -o /tmp/Linux/toolbox/when
-curl -s -L --retry 5 $WHEN_CLI_URL/when -o /tmp/Darwin/toolbox/when
 
 chmod +x /tmp/Linux/toolbox/when
-chmod +x /tmp/Darwin/toolbox/when
 
 #
 # Download and add SPC CLI to the release
 #
 echo "Download SPC CLI"
 
 curl -s -L --retry 5 $SPC_CLI_URL/spc_Linux_x86_64.tar.gz -o /tmp/Linux/spc_Linux.tar.gz
-curl -s -L --retry 5 $SPC_CLI_URL/spc_Darwin_x86_64.tar.gz -o /tmp/Darwin/spc_Darwin.tar.gz
 
 cd /tmp/Linux && tar -zxf spc_Linux.tar.gz && mv spc toolbox/ && cd -
-cd /tmp/Darwin && tar -zxf spc_Darwin.tar.gz && mv spc toolbox/ && cd -
 
 #
 # Create linux release