diff --git a/setup b/setup
index 662abdca0..3ba693aea 100755
--- a/setup
+++ b/setup
@@ -63,12 +63,12 @@ esac
 if [[ -f "${SUBCMD_DIR}/options.sh" ]];
   then source "${SUBCMD_DIR}/options.sh"
 fi
-for function in ${print_os_group_id_functions[@]}; do
-  $function
-done
-pause
 case ${SUBCMD_NAME} in
   install)
+    for function in ${print_os_group_id_functions[@]}; do
+      $function
+    done
+    pause
     if [[ "${SKIP_ALLGREETING}" != true ]]; then
       source ${SUBCMD_DIR}/0.greeting.sh
     fi
@@ -83,16 +83,28 @@ case ${SUBCMD_NAME} in
     fi
     ;;
   install-deps)
+    for function in ${print_os_group_id_functions[@]}; do
+      $function
+    done
+    pause
     if [[ "${SKIP_ALLDEPS}" != true ]]; then
       source ${SUBCMD_DIR}/1.deps-router.sh
     fi
     ;;
   install-setups)
+    for function in ${print_os_group_id_functions[@]}; do
+      $function
+    done
+    pause
     if [[ "${SKIP_ALLSETUPS}" != true ]]; then
       source ${SUBCMD_DIR}/2.setups.sh
     fi
     ;;
   install-files)
+    for function in ${print_os_group_id_functions[@]}; do
+      $function
+    done
+    pause
     if [[ "${SKIP_ALLFILES}" != true ]]; then
       source ${SUBCMD_DIR}/3.files.sh
     fi