Text formatting.

1 files changed, 19 insertions, 14 deletions

diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh
index b7badc1..52874da 100755
--- a/scripts/mageia-reset-and-import.sh
+++ b/scripts/mageia-reset-and-import.sh
@@ -36,7 +36,7 @@ if [ -f ../svn-import.log ]; then
     echo "Extra SVN Revisions to squash:$morerevisionsx"
     echo "SVN Revisions to skip:        $skiprevisionsx"
     echo
-    echo "Do you want to reply it? [Y/n]"
+    echo "Do you want to replay it? [Y/n]"
     read REPLAY
     if [ -z "$REPLAY" -o "Y" = "$REPLAY" ]; then
       REPLAY=y
@@ -70,10 +70,11 @@ echo "done"
 
 
 echo
-echo "OK now the fun stuff beings. You need to find the git commit at which you want to"
-echo "start the magiea import. This will typically require some investigation but the"
-echo "date will be around February 2011."
-echo "I will drop you to a shell. When you are done, simply copy the SHA1 sum and exit."
+echo "OK now the fun stuff beings. You need to find the git commit at which you want"
+echo "to start the magiea import. This will typically require some investigation but"
+echo "the date will be around February 2011."
+echo "I will drop you to a shell. When you are done, simply copy the SHA1 sum and"
+echo "exit."
 echo "The commands you like want are 'git log trunk' and 'git show SHA1'"
 echo
 if [ -z "$REPLAY" ]; then
@@ -87,8 +88,9 @@ if [ -z "$REPLAY" ]; then
 fi
 
 if [ -z "$resetsha1" ]; then
-  echo "You did not give any SHA1 sum. I will not reset the git repository and carry on importing"
-  echo "from it's current state. You can quit this script and start again if this is incorrect."
+  echo "You did not give any SHA1 sum. I will not reset the git repository and carry"
+  echo "on importing from it's current state. You can quit this script and start"
+  echo "again if this is incorrect."
 else
   echo "I got SHA1 '$resetsha1'. I hope that's correct".
   echo
@@ -131,10 +133,11 @@ fi
 
 
 echo
-echo "I will now run 'svn log' on the software. You should be able to guess the right revision"
-echo "to base the import on. When done, simply copy (or remember) the revision number and enter it"
-echo "into this script. You will also be able to (optionall) select several other commits which"
-echo "you wish to squash into this initial commit."
+echo "I will now run 'svn log' on the software. You should be able to guess the right"
+echo "revision to base the import on. When done, simply copy (or remember) the"
+echo "revision number and enter it into this script. You will also be able to"
+echo "(optional) select several other commits which you wish to squash into this"
+echo "initial commit."
 echo
 if [ -z "$REPLAY" ]; then
   echo "Press any key to contiue."
@@ -192,9 +195,10 @@ fi
 
 echo
 echo "The next step is the dangerous bit. We will clear out all files in the current"
-echo "working copy, run an svn export and then drop you to a shell to investigate the differences"
-echo "In that shell you must git add any new files that appear and ensure you are happy with"
-echo "the generate state of things."
+echo "working copy, run an svn export and then drop you to a shell to investigate the"
+echo "differences."
+echo "In that shell you must git add any new files that appear and ensure you are"
+echo "happy with the general state of things."
 echo
 echo "Continue? (press ctrl+c if not)"
 read -n 1
@@ -406,6 +410,7 @@ parsesvnrevmap()
   done
 }
 
+echo
 echo -n "Creating revision -> sha1 map SQL... "
 
 sql="../$SOFTWARE-revmap.sql"