Skip to content

Commit

Permalink
small fixups and misunderstandings about nested submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
iedemam committed Mar 26, 2014
1 parent 1bead5a commit d99c39a
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 7 deletions.
3 changes: 2 additions & 1 deletion clone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ do
sayAndDo git checkout --track $remote
done
sayAndDo git checkout master
sayAndDo git submodule foreach 'git checkout master'
sayAndDo git submodule init
sayAndDo git submodule update --init --recursive
cd ..
echo
fi
Expand Down
69 changes: 69 additions & 0 deletions create.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/bin/bash
#
# Copyright 2014 Range Networks, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# See the COPYING file in the main directory for details.
#

source $(dirname $0)/common.source

usage () {
echo "# usage: ./create.sh component-directory (tag/branch name)"
exit 1
}

# What component do we want to manipulate?
if [ -z "$1" ]; then
usage
elif [ ! -d $1 ]; then
usage
else
COMPONENT=$1
fi

# Are we adding a creating or branch?
if [ -z "$2" ]; then
read -r -p "# Do you want to create a tag or branch? " TYPE
elif [ $2 == "tag" ]; then
TYPE="tag"
elif [ $2 == "branch" ]; then
TYPE="branch"
else
usage
fi

# Which one should be created?
if [ -z "$3" ]; then
read -r -p "# What new $TYPE would you like to create? " NAME
else
NAME=$3
fi

# Really, truly? Alrighty, execute.
read -r -p "# To create a new $TYPE named $NAME, answer \"yes\" " ANSWER
if [ $ANSWER == "yes" ]; then
cd $COMPONENT
if [ $TYPE == "tag" ]; then
echo "# Sorry, tag creations haven't been implemented. Bailing."
exit 1
elif [ $TYPE == "branch" ]; then
echo "# - creating..."
sayAndDo git checkout -b $NAME
echo "# - pushing to origin..."
sayAndDo git push -u origin $NAME
fi
else
echo "# - better safe than sorry, cancelling..."
fi
2 changes: 1 addition & 1 deletion delete.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
source $(dirname $0)/common.source

usage () {
echo "# usage: ./delete.sh component-directory (tag/branch current-tag new-tag)"
echo "# usage: ./delete.sh component-directory (tag/branch name)"
exit 1
}

Expand Down
3 changes: 1 addition & 2 deletions pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ do
echo "# pulling $component"
cd $component
sayAndDo git pull
sayAndDo git submodule update --remote
sayAndDo git submodule foreach --recursive 'git pull'
sayAndDo git submodule update --recursive
cd ..
echo
fi
Expand Down
2 changes: 1 addition & 1 deletion rename.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
source $(dirname $0)/common.source

usage () {
echo "# usage: ./rename.sh component-directory (tag/branch current-tag new-tag)"
echo "# usage: ./rename.sh component-directory (tag/branch current-name new-name)"
exit 1
}

Expand Down
4 changes: 2 additions & 2 deletions switchto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
source $(dirname $0)/common.source

usage () {
echo "# usage: ./switchto.sh branch-name"
echo "# usage: ./switchto.sh branch-or-tag-name"
exit 1
}

Expand All @@ -35,7 +35,7 @@ do
echo "# $component"
cd $component
sayAndDo git checkout $1
sayAndDo git submodule foreach --recursive "git checkout $1"
sayAndDo git submodule update --recursive
cd ..
echo
fi
Expand Down

0 comments on commit d99c39a

Please sign in to comment.