/[pcsx2_0.9.7]/auto_update_from_upstream.sh
ViewVC logotype

Diff of /auto_update_from_upstream.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- auto_update_from_upstream.sh	2010/09/10 11:54:46	131
+++ auto_update_from_upstream.sh	2010/09/10 12:30:03	132
@@ -50,18 +50,27 @@
 export current_downstream_revision=`cat "$downstream_export_location/trunk/upstream_repository_revision.txt"`
 export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`
 
+
+
 if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
-	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
-		echo "UPSTREAM REVISION: $PCSX2_REVISION"
-		echo "DOWNSTREAM REVISION: $current_downstream_revision"
-		echo "LOCAL REVISION: $current_local_revision"
-		echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
-		echo
-		echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
-		echo
-		echo -e "\\tAborting update of $downstream_export_location/trunk"
-		echo
-		exit 0
+	if [ "$current_downstream_revision" == "$PCSX2_REVISION" ] ; then		
+		if [  $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
+			echo "UPSTREAM REVISION: $PCSX2_REVISION"
+			echo "DOWNSTREAM REVISION: $current_downstream_revision"
+			echo "LOCAL REVISION: $current_local_revision"		
+			echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
+		else
+			echo "UPSTREAM REVISION: $PCSX2_REVISION"
+			echo "DOWNSTREAM REVISION: $current_downstream_revision"
+			echo "LOCAL REVISION: $current_local_revision"
+			echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
+			echo
+			echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated and local has not been modified."
+			echo
+			echo -e "\\tAborting update of $downstream_export_location/trunk"
+			echo
+			exit 0
+		fi
 	else
 		echo "UPSTREAM REVISION: $PCSX2_REVISION"
 		echo "DOWNSTREAM REVISION: $current_downstream_revision"
@@ -69,22 +78,12 @@
 		echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
 	fi		
 else
-	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
-		echo "UPSTREAM REVISION: $PCSX2_REVISION"
-		echo "DOWNSTREAM REVISION: $current_downstream_revision"
-		echo "LOCAL REVISION: $current_local_revision"
-		echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
-		echo
-		echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
-		echo
-		echo -e "\\tDetected the use of: --force-update ... forcing update ..."
-	else
-		echo "UPSTREAM REVISION: $PCSX2_REVISION"
-		echo "DOWNSTREAM REVISION: $current_downstream_revision"
-        	echo "LOCAL REVISION: $current_local_revision"
-  	 	echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
-	fi
-
+	echo "UPSTREAM REVISION: $PCSX2_REVISION"
+	echo "DOWNSTREAM REVISION: $current_downstream_revision"
+	echo "LOCAL REVISION: $current_local_revision"
+	echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
+	echo
+	echo -e "\\tDetected the use of: --force-update ... forcing update ..."
 fi
 
 

 

  ViewVC Help
Powered by ViewVC 1.1.22