updated logic to the main script instead of functions

Author: Jared Murrell

_functions.sh

@@ -203,81 +203,78 @@ function _discover_submodules()
   unset IGNORE_DIRS SUBMODULES ACTIONS SELECTION SUBDIRS choices options MENU FLAGS
   _get_svn_layout
   clear
-  if [[ ${ENABLE_SUBMODULES} ]]
+  echo "Discovering potential submodule candidates..."
+  # Get the potential list of submodules, with branches, tags and trunk
+  svn -R list ${REPO_URL} ${SVN_OPTIONS}|grep -E '(/trunk/$|/branches/$|/tags/$)' > /tmp/submodules.txt
+  # it turns out, some folks have .git in their repos, and this falsely
+  # identifies those as submodules. Let's remove those entries and not
+  # present the user with the option to migrate them
+  sed -i 's/\/.git\//d' /tmp/submodules.txt
+  # Remove empty "trunk", "tags" and "branches" from the list of potentials
+  for DIR in $(cat /tmp/submodules.txt);
+  do
+    FILES=$(svn list ${REPO_URL}/${DIR} ${SVN_OPTIONS})
+    if [[ ${#FILES} -le 1 ]]
+    then
+      sed -i "s/${DIR}/d" /tmp/submodules.txt
+    fi
+  done
+  # Get the path to the submodules
+  export SUBMODULES=$(grep -E '(/trunk/$|/branches/$|/tags/$)' /tmp/submodules.txt|\
+  sed -e 's/trunk\/$//' -e 's/tags\/$//' -e 's/branches\/$//'|sort|uniq)
+
+  # Print a report of the discovered submodules
+  if [[ ${#SUBMODULES} -le 4 ]]
   then
-    echo "Discovering potential submodule candidates..."
-    # Get the potential list of submodules, with branches, tags and trunk
-    svn -R list ${REPO_URL} ${SVN_OPTIONS}|grep -E '(/trunk/$|/branches/$|/tags/$)' > /tmp/submodules.txt
-    # it turns out, some folks have .git in their repos, and this falsely
-    # identifies those as submodules. Let's remove those entries and not
-    # present the user with the option to migrate them
-    sed -i 's/\/.git\//d' /tmp/submodules.txt
-    # Remove empty "trunk", "tags" and "branches" from the list of potentials
-    for DIR in $(cat /tmp/submodules.txt);
-    do
-      FILES=$(svn list ${REPO_URL}/${DIR} ${SVN_OPTIONS})
-      if [[ ${#FILES} -le 1 ]]
+    echo "There were no nested repositories discovered"
+  else
+    options=($(echo ${SUBMODULES}))
+    #Actions to take based on selection
+    function ACTIONS {
+      for NUM in ${!options[@]}; do
+        [[ ${choices[NUM]} ]] && SUBDIRS+="${options[NUM]} "
+      done
+      if [[ ! -z ${SUBDIRS} ]]
       then
-        sed -i "s/${DIR}/d" /tmp/submodules.txt
+        export IGNORE_DIRS=$(echo "'^("${SUBDIRS}")$'"|sed -e 's/ /|/g;s/\/|)/\/)/')
+        export FLAGS+=" --ignore-paths ${IGNORE_DIRS}"
       fi
-    done
-    # Get the path to the submodules
-    export SUBMODULES=$(grep -E '(/trunk/$|/branches/$|/tags/$)' /tmp/submodules.txt|\
-    sed -e 's/trunk\/$//' -e 's/tags\/$//' -e 's/branches\/$//'|sort|uniq)
-
-    # Print a report of the discovered submodules
-    if [[ ${#SUBMODULES} -le 4 ]]
-    then
-      echo "There were no nested repositories discovered"
-    else
-      options=($(echo ${SUBMODULES}))
-      #Actions to take based on selection
-      function ACTIONS {
+    }
+    #Variables
+    ERROR=" "
+    #Clear screen for menu
+    clear
+    #Menu function
+    function MENU {
+      _print_banner "We have discovered the following folders that contain" \
+        "branches, tags, or trunk. This typically means that teams are using" \
+        "them as separate repositories, but there is no real method of" \
+        "discovering this, outside of the 'svn:externals' property, which is" \
+        "often not used. Please review the following folders and select which" \
+        "ones are to be treated as git submodules"
+        echo ""
+        echo "Discovered Folders"
         for NUM in ${!options[@]}; do
-          [[ ${choices[NUM]} ]] && SUBDIRS+="${options[NUM]} "
+          echo "[""${choices[NUM]:- }""]" $(( NUM+1 ))") ${options[NUM]}"
         done
-        if [[ ! -z ${SUBDIRS} ]]
-        then
-          export IGNORE_DIRS=$(echo "'^("${SUBDIRS}")$'"|sed -e 's/ /|/g;s/\/|)/\/)/')
-          export FLAGS+=" --ignore-paths ${IGNORE_DIRS}"
-        fi
-      }
-      #Variables
-      ERROR=" "
-      #Clear screen for menu
+        echo "$ERROR"
+    }
+    #Menu loop
+    while MENU && read -e -p "Select the desired options using their number (again to uncheck, ENTER when done): " -n1 SELECTION && [[ -n "${SELECTION}" ]]; do
       clear
-      #Menu function
-      function MENU {
-        _print_banner "We have discovered the following folders that contain" \
-          "branches, tags, or trunk. This typically means that teams are using" \
-          "them as separate repositories, but there is no real method of" \
-          "discovering this, outside of the 'svn:externals' property, which is" \
-          "often not used. Please review the following folders and select which" \
-          "ones are to be treated as git submodules"
-          echo ""
-          echo "Discovered Folders"
-          for NUM in ${!options[@]}; do
-            echo "[""${choices[NUM]:- }""]" $(( NUM+1 ))") ${options[NUM]}"
-          done
-          echo "$ERROR"
-      }
-      #Menu loop
-      while MENU && read -e -p "Select the desired options using their number (again to uncheck, ENTER when done): " -n1 SELECTION && [[ -n "${SELECTION}" ]]; do
-        clear
-        if [[ "${SELECTION}" == *[[:digit:]]* && ${SELECTION} -ge 1 && ${SELECTION} -le ${#options[@]} ]]; then
-          (( SELECTION-- ))
-          if [[ "${choices[SELECTION]}" == "+" ]]; then
-            choices[SELECTION]=""
-          else
-            choices[SELECTION]="+"
-          fi
-          ERROR=" "
+      if [[ "${SELECTION}" == *[[:digit:]]* && ${SELECTION} -ge 1 && ${SELECTION} -le ${#options[@]} ]]; then
+        (( SELECTION-- ))
+        if [[ "${choices[SELECTION]}" == "+" ]]; then
+          choices[SELECTION]=""
         else
-          ERROR="Invalid option: ${SELECTION}"
+          choices[SELECTION]="+"
         fi
-      done
-      ACTIONS
-    fi
+        ERROR=" "
+      else
+        ERROR="Invalid option: ${SELECTION}"
+      fi
+    done
+    ACTIONS
   fi
 }
 

svn2github.sh

@@ -11,8 +11,13 @@ fi
 _welcome
 _setup
 _svn_sizer
-_discover_submodules
-_process_submodules
+if [[ ${ENABLE_SUBMODULES} ]]
+then
+  _discover_submodules
+  _process_submodules
+else
+  _get_svn_layout
+fi
 _git_svn_clone
 (
   cd ${REPO_NAME}