| 
				
			 | 
			
			
				@@ -131,10 +131,21 @@ function reconfigure_mediagoblin { 
			 | 
		
	
		
			
			| 
				131
			 | 
			
				131
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				132
			 | 
			
				132
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				133
			 | 
			
				133
			 | 
			
			
				 function upgrade_mediagoblin { 
			 | 
		
	
		
			
			| 
				134
			 | 
			
				
			 | 
			
			
				-    MEDIAGOBLIN_BASE_DIR=/var/www/$MEDIAGOBLIN_DOMAIN_NAME/htdocs 
			 | 
		
	
		
			
			| 
				135
			 | 
			
				
			 | 
			
			
				-    su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate" - mediagoblin 
			 | 
		
	
		
			
			| 
				136
			 | 
			
				
			 | 
			
			
				-    mediagoblin_fix_email 
			 | 
		
	
		
			
			| 
				137
			 | 
			
				
			 | 
			
			
				-    su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && ./bin/gmg dbupdate" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				134
			 | 
			
			
				+    CURR_MEDIAGOBLIN_COMMIT=$(cat $COMPLETION_FILE | grep "mediagoblin commit" | awk -F ':' '{print $2}') 
			 | 
		
	
		
			
			| 
				
			 | 
			
				135
			 | 
			
			
				+    if [[ "$CURR_MEDIAGOBLIN_COMMIT" != "$MEDIAGOBLIN_COMMIT" ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				136
			 | 
			
			
				+        MEDIAGOBLIN_BASE_DIR=/var/www/$MEDIAGOBLIN_DOMAIN_NAME/htdocs 
			 | 
		
	
		
			
			| 
				
			 | 
			
				137
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && git stash && git pull" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				138
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && git checkout $MEDIAGOBLIN_COMMIT -b $MEDIAGOBLIN_COMMIT" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				139
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && git submodule sync" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				140
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && git submodule update --force --init --recursive" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				141
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ./bootstrap.sh" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				142
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && ./configure" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				143
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin && make" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				144
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				145
			 | 
			
			
				+        mediagoblin_fix_email 
			 | 
		
	
		
			
			| 
				
			 | 
			
				146
			 | 
			
			
				+        su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && ./bin/gmg dbupdate" - mediagoblin 
			 | 
		
	
		
			
			| 
				
			 | 
			
				147
			 | 
			
			
				+        set_completion_param "mediagoblin commit" "$MEDIAGOBLIN_COMMIT" 
			 | 
		
	
		
			
			| 
				
			 | 
			
				148
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				138
			 | 
			
				149
			 | 
			
			
				     echo "0" 
			 | 
		
	
		
			
			| 
				139
			 | 
			
				150
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				140
			 | 
			
				151
			 | 
			
			
				  
			 |