cleanup linter warnings
git-svn-id: svn://svn.chromium.org/chrome/branches/dart/1908/src@264998 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/dartium_tools/start_dartium_roll.sh b/dartium_tools/start_dartium_roll.sh
index b6033e1..41aebbf7 100755
--- a/dartium_tools/start_dartium_roll.sh
+++ b/dartium_tools/start_dartium_roll.sh
@@ -55,7 +55,7 @@
if [ "$do_verbose" = 1 ]; then
if [ "${1}" = "" ]; then
echo
- else
+ else
echo -e "...${1}..."
fi
fi
@@ -86,9 +86,9 @@
verbose_message "Validating Remotes"
if [ "$do_which" = "chrome" ]; then
- # Ensure remote for old Dartium release exist (e.g., remotes/dart1847)
+ # Ensure remote for old Dartium release exist (e.g., remotes/dart1847)
remote_dart_last=$(git branch -a | grep "remotes/dart${do_old_branch}")
- # Ensure remote for new Dartium release exist (e.g., remotes/dart1908)
+ # Ensure remote for new Dartium release exist (e.g., remotes/dart1908)
remote_dart_new=$(git branch -a | grep "remotes/dart${do_new_branch}")
if [ "$remote_dart_last" = "" ]; then
$(display_error "missing old remotes/dart${do_old_branch}")
@@ -99,9 +99,9 @@
exit -1
fi
elif [ "$do_which" = "blink" ]; then
- # Ensure remote for old Dartium release exist (e.g., remotes/dart1847)
+ # Ensure remote for old Dartium release exist (e.g., remotes/dart1847)
remote_dart_last=$(git branch -a | grep "remotes/blink-svn/${do_old_branch}")
- # Ensure remote for new Dartium release exist (e.g., remotes/dart1908)
+ # Ensure remote for new Dartium release exist (e.g., remotes/dart1908)
remote_dart_new=$(git branch -a | grep "remotes/blink-svn/multivm-${do_new_branch}")
if [ "$remote_dart_last" = "" ]; then
@@ -119,7 +119,7 @@
}
function stripped_exist {
- local branch_name=$(git branch --no-color --list $(stripped_name) | sed 's/^[ \t\*]*//')
+ local branch_name=$(git branch --no-color --list $(stripped_name) | sed 's/^[ \t\*]*//')
echo $branch_name
}
@@ -565,7 +565,7 @@
# cherry-picked $OLD commits from trunkdart$OLD.
#
# stripped$OLD, trunkdart$OLD points the SVN remote repository
-#
+#
# svn://svn.chromium.org/chrome/branches/dart/1847/src
#
# trunkdart$NEW points to the SVN remote repository
@@ -597,14 +597,14 @@
# $LAST, last commit in $NEW, is computed by:
# > git log stripped1847 --pretty=format:'%H' -1
# Return a GIT hash code e.g., 44d12cd4b7e041f8d06f8735f1af08abb66825c4
-#
+#
# STEP 2.
# -------
# Create the trunkdart$OLD e.g.,
# > git checkout -b trunkdart$OLD $BASE
# > git cherry-pick $BASE..$LAST
#
-# e.g., git checkout -b trunkdart1847
+# e.g., git checkout -b trunkdart1847
#
# Create branch trunkdart$OLD and reapplies all Dart-related work on $OLD (from
# the stripped branch created in Step1.). This cherry-pick should not have any
@@ -700,7 +700,7 @@
hash_codes_base_last ${remoteOld}
echo "git rebase -i ${hash_base}"
- echo
+ echo
elif [ "$old_branch_found" = "" ]; then
echo "------------------ Step 2. ---------------------"
echo
@@ -715,7 +715,7 @@
echo "git checkout -b ${branch_trunkdart_old} ${hash_base}"
echo "git cherry-pick ${hash_base}..${hash_last}"
- echo
+ echo
elif [ "$new_branch_found" = "" ]; then
echo "------------------ Step 3. ---------------------"
echo
@@ -729,7 +729,7 @@
echo "git checkout -b ${branch_trunkdart_new} ${remoteOld}"
echo "git cherry-pick ${hash_base2}..${hash_last2}"
- echo
+ echo
else
echo "===== Nothing to do - Roll setup complete. ====="
fi
@@ -762,7 +762,7 @@
hash_codes_base_last ${remoteOld}
eho "git rebase -i ${hash_base}"
- echo
+ echo
elif [ "$old_branch_found" = "" ]; then
echo "------------------ Step 2. ---------------------"
echo
@@ -777,7 +777,7 @@
echo "git checkout -b ${branch_trunkdart_old} ${hash_base}"
echo "git cherry-pick ${hash_base}..${hash_last}"
- echo
+ echo
elif [ "$new_branch_found" = "" ]; then
echo "------------------ Step 3. ---------------------"
echo
@@ -792,7 +792,7 @@
echo "git checkout -b ${branch_trunkdart_new} ${remoteOld}"
echo "git cherry-pick ${hash_base2}..${hash_last2}"
- echo
+ echo
else
echo "===== Nothing to do - Roll setup complete. ====="
fi
