/[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

revision 131 by william, Fri Sep 10 11:54:46 2010 UTC revision 132 by william, Fri Sep 10 12:30:03 2010 UTC
# Line 50  fi Line 50  fi
50  export current_downstream_revision=`cat "$downstream_export_location/trunk/upstream_repository_revision.txt"`  export current_downstream_revision=`cat "$downstream_export_location/trunk/upstream_repository_revision.txt"`
51  export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`  export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`
52    
53    
54    
55  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
56          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then          if [ "$current_downstream_revision" == "$PCSX2_REVISION" ] ; then              
57                  echo "UPSTREAM REVISION: $PCSX2_REVISION"                  if [  $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
58                  echo "DOWNSTREAM REVISION: $current_downstream_revision"                          echo "UPSTREAM REVISION: $PCSX2_REVISION"
59                  echo "LOCAL REVISION: $current_local_revision"                          echo "DOWNSTREAM REVISION: $current_downstream_revision"
60                  echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"                          echo "LOCAL REVISION: $current_local_revision"          
61                  echo                          echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
62                  echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."                  else
63                  echo                          echo "UPSTREAM REVISION: $PCSX2_REVISION"
64                  echo -e "\\tAborting update of $downstream_export_location/trunk"                          echo "DOWNSTREAM REVISION: $current_downstream_revision"
65                  echo                          echo "LOCAL REVISION: $current_local_revision"
66                  exit 0                          echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
67                            echo
68                            echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated and local has not been modified."
69                            echo
70                            echo -e "\\tAborting update of $downstream_export_location/trunk"
71                            echo
72                            exit 0
73                    fi
74          else          else
75                  echo "UPSTREAM REVISION: $PCSX2_REVISION"                  echo "UPSTREAM REVISION: $PCSX2_REVISION"
76                  echo "DOWNSTREAM REVISION: $current_downstream_revision"                  echo "DOWNSTREAM REVISION: $current_downstream_revision"
# Line 69  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != Line 78  if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" !=
78                  echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"                  echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
79          fi                        fi              
80  else  else
81          if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then          echo "UPSTREAM REVISION: $PCSX2_REVISION"
82                  echo "UPSTREAM REVISION: $PCSX2_REVISION"          echo "DOWNSTREAM REVISION: $current_downstream_revision"
83                  echo "DOWNSTREAM REVISION: $current_downstream_revision"          echo "LOCAL REVISION: $current_local_revision"
84                  echo "LOCAL REVISION: $current_local_revision"          echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
85                  echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"          echo
86                  echo          echo -e "\\tDetected the use of: --force-update ... forcing update ..."
                 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  
   
87  fi  fi
88    
89    

Legend:
Removed from v.131  
changed lines
  Added in v.132

  ViewVC Help
Powered by ViewVC 1.1.22