Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions _functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,9 @@ function _discover_submodules()
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)
#export SUBMODULES=$(grep -E '(/trunk/$|/branches/$|/tags/$)' /tmp/submodules.txt|\
#sed -e 's/trunk\/$//' -e 's/tags\/$//' -e 's/branches\/$//'|sort|uniq)
export SUBMODULES=$(grep ^nn submodules.txt | grep trunk | awk -F'trunk' {'print $1'})

# Print a report of the discovered submodules
if [[ ${#SUBMODULES} -le 4 ]]
Expand Down Expand Up @@ -331,7 +332,8 @@ function _process_submodules()
do
(
REPO_URL=${REPOSITORY}/${SUBMODULE}
REPO_NAME=$(echo ${SUBMODULE}|awk -F'/' {'print $(NF-1)'})
#REPO_NAME=$(echo ${SUBMODULE}|awk -F'/' {'print $(NF-1)'})
REPO_NAME=$(echo ${SUBMODULE}|sed 's/\//-/g;s/.$//g')
GITHUB_REMOTE=${GITHUB_URL}/${GITHUB_ORG}/${REPO_NAME}.git
REV_LIST=$(svn log ${REPO_URL} ${SVN_OPTIONS}|grep ^r[0-9]|awk {'print $1'}|sed 's/r//'|sort)
echo "${SUBMODULE},${GITHUB_REMOTE}" >> /tmp/github_remotes.txt
Expand Down