Code review: 259070043: Additionally utility scripts changes log2time…

…line#270

config/dpkg/changelog

@@ -2,4 +2,4 @@ python-plaso (1.3.1-1) unstable; urgency=low
 
   * Auto-generated
 
- -- Log2Timeline <[email protected]>  Thu, 30 Jul 2015 06:35:35 +0200
+ -- Log2Timeline <[email protected]>  Thu, 30 Jul 2015 13:55:46 +0200

utils/common.sh

@@ -106,7 +106,7 @@ generate_api_documentation()
 {
   which sphinx-apidoc >/dev/null 2>&1;
 
-  if $? -ne ${EXIT_SUCCESS};
+  if test $? -ne ${EXIT_SUCCESS};
   then
     echo "WARNING: missing sphinx-apidoc - unable to update API documentation.";
 

utils/review.sh

@@ -130,6 +130,14 @@ then
     then
       echo "Review aborted - unable to run: 'git pull --rebase upstream master'.";
 
+      exit ${EXIT_FAILURE};
+    fi
+    git push -f
+
+    if test $? -ne 0;
+    then
+      echo "Review aborted - unable to run: 'git push -f' after update with upstream.";
+
       exit ${EXIT_FAILURE};
     fi
   fi
@@ -197,10 +205,29 @@ then
   DESCRIPTION="";
   get_last_change_description "DESCRIPTION";
 
+  echo "Automatic generated description of code review request:";
+  echo "${DESCRIPTION}";
+  echo "";
+
+  echo "Hit enter to use the automatic description or enter an alternative";
+  echo "description of code review request:";
+  read INPUT_DESCRIPTION
+
+  if ! test -z "${INPUT_DESCRIPTION}";
+  then
+    DESCRIPTION=${INPUT_DESCRIPTION};
+  fi
+
   if ! test -z "${BROWSER_PARAM}";
   then
-    echo "You need to visit https://codereview.appspot.com/get-access-token";
-    echo "and copy+paste the access token to the window (no prompt)";
+    echo "Upload server: codereview.appspot.com (change with -s/--server)";
+    echo "Go to the following link in your browser:";
+    echo "";
+    echo "    https://codereview.appspot.com/get-access-token";
+    echo "";
+    echo "and copy the access token.";
+    echo "";
+    echo -n "Enter access token: ";
   fi
 
   TEMP_FILE=`mktemp .tmp_${PROJECT_NAME}_code_review.XXXXXX`;
@@ -247,7 +274,7 @@ then
   fi
 
 else
-  echo -n "Short description of code review request: ";
+  echo "Enter a description of code review request:";
   read DESCRIPTION
 
   # Check if we need to set --cache.
@@ -264,8 +291,14 @@ else
 
   if ! test -z "${BROWSER_PARAM}";
   then
-    echo "You need to visit https://codereview.appspot.com/get-access-token";
-    echo "and copy+paste the access token to the window (no prompt)";
+    echo "Upload server: codereview.appspot.com (change with -s/--server)";
+    echo "Go to the following link in your browser:";
+    echo "";
+    echo "    https://codereview.appspot.com/get-access-token";
+    echo "";
+    echo "and copy the access token.";
+    echo "";
+    echo -n "Enter access token: ";
   fi
 
   TEMP_FILE=`mktemp .tmp_${PROJECT_NAME}_code_review.XXXXXX`;

utils/update.sh

@@ -109,6 +109,14 @@ then
     then
       echo "Update aborted - unable to run: 'git pull --rebase upstream master'.";
 
+      exit ${EXIT_FAILURE};
+    fi
+    git push -f
+
+    if test $? -ne 0;
+    then
+      echo "Review aborted - unable to run: 'git push -f' after update with upstream.";
+
       exit ${EXIT_FAILURE};
     fi
   fi