Fixed the gmc version check script

gallery · Nov 22, 2007 · 86eb6b3 · 86eb6b3
1 parent 24582de
commit 86eb6b3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 16 deletions.
diff --git a/build.xml b/build.xml
@@ -30,7 +30,7 @@
   <!-- Compile the java code from ${src} into ${build} -->
   <javac srcdir="${src}" destdir="${build}"
    includes="com/**,HTTPClient/**,edu/**"
-   listfiles="on" debug="on" source="1.3">
+   listfiles="on" debug="on" nowarn="on" source="1.3" target="1.3">
    <classpath>
     <pathelement location="lib/AppleJavaExtensions.jar"/>
     <pathelement location="lib/metadata-extractor-2.1.jar"/>

diff --git a/com/gallery/GalleryRemote/util/PostChangeLog.java b/com/gallery/GalleryRemote/util/PostChangeLog.java
@@ -110,7 +110,7 @@ public void execute() throws BuildException {
 				new NVPair("name", changeProps.getProperty("username")),
 				new NVPair("pass", changeProps.getProperty("password")),
 				new NVPair("form_id", "user_login"),
-				new NVPair("op", "Log in"),
+				new NVPair("op", "Log in")
 			};
 
 			// set cookie handling
@@ -129,24 +129,38 @@ public boolean sendCookie(Cookie cookie, RoRequest req) {
 			HTTPConnection mConnection = new HTTPConnection("gallery.menalto.com");
 			HTTPResponse rsp = null;
 			String response = null;
+
+			// get login
+                        rsp = mConnection.Get("/user");
+			response = new String(rsp.getData()).trim();
+			System.out.println("Get login response: " + response);
+
+			System.out.println(); System.out.println();
+			System.out.println("*****************************");
 
 			// login
 			rsp = mConnection.Post("/user", form_data_login);
 			response = new String(rsp.getData()).trim();
 			System.out.println("Login response: " + response);
 
+			System.out.println(); System.out.println();
+                        System.out.println("*****************************");
+
 			// get form
-			rsp = mConnection.Get("/admin/gmc_versioncheck/save/5");
+			rsp = mConnection.Get("/admin/gmc_versioncheck/edit/5");
 			response = new String(rsp.getData()).trim();
 			System.out.println("Get form response: " + response);
 
-			Pattern p = Pattern.compile("^<input type=\"hidden\" name=\"form_token\".*value=\"(.*)\".*$", 
-					Pattern.MULTILINE);
+			System.out.println(); System.out.println();
+			System.out.println("*****************************");
+
+			Pattern p = Pattern.compile(".*<input type=\"hidden\" name=\"form_token\" id=\"edit-gmc-versioncheck-form-form-token\" value=\"([0123456789abcdef]*)\"\\s*/>.*", Pattern.DOTALL);
 			m = p.matcher(response);
 
 			if (m.matches()) {
 				String formToken = m.group(1);
-
+				System.out.println("Form token: " + formToken);
+
 				NVPair form_data_submit[] = {
 					new NVPair("url", "galleryremote/beta"),
 					new NVPair("note", note.toString()),
@@ -157,7 +171,7 @@ public boolean sendCookie(Cookie cookie, RoRequest req) {
 				};
 
 				// login
-				rsp = mConnection.Post("/admin/gmc_versioncheck/save/5", form_data_submit);
+				rsp = mConnection.Post("/admin/gmc_versioncheck/edit/5", form_data_submit);
 				response = new String(rsp.getData()).trim();
 				System.out.println("Submit response: " + response);
 
@@ -180,6 +194,9 @@ public boolean sendCookie(Cookie cookie, RoRequest req) {
 				} else {
 					System.out.println("Failed to update Menalto");
 				}
+			} else {
+				System.out.println("Could not find the form_token");
+				System.out.println("Failed to update Menalto");
 			}
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();

diff --git a/deploy.sh b/deploy.sh
@@ -1,25 +1,30 @@
+# gallery_docs is no longer maintained, don't bother updating it...
+#echo -e "Updating docs SVN...\n\n";
+#pushd ../gallery_docs; svn update; popd;
 
-echo -e "Updating CVS...\n\n";
-cvs -q update -d;
+set ANT=/usr/local/bin/ant;
+
+echo -e "Updating SVN...\n\n";
+svn update;
 
 version=`grep version= defaults.properties | awk -F= '{print $2}'`;
 echo -e "\n\nVersion: $version\n\n";
 
 echo -e "Checking nightly site...\n\n";
-if (lynx -dump -head http://jpmullan.com/galleryupdates/remote/gallery_remote_${version}.zip \
+if (lynx -dump -head http://www.gallery2.hu/download/GalleryRemote/gallery_remote_${version}.zip \
 	| grep "HTTP/1.1 404") then
 	echo -e "\n\nWe have a new version.";
 
 	echo -e "\n\nBuilding...\n\n";
 	ant nightly;
 
 	echo -e "\n\nUploading to the nightly site...\n\n";
-	scp gallery_remote.zip paour@jpmullan.com:remote/gallery_remote_${version}.zip;
-	ssh paour@jpmullan.com "cp -pf remote/gallery_remote_${version}.zip remote/current_gallery_remote.zip";
-	scp gallery_remote_applets.zip paour@jpmullan.com:remote/gallery_remote_applets_${version}.zip;
-	ssh paour@jpmullan.com "cp -pf remote/gallery_remote_applets_${version}.zip remote/current_gallery_remote_applets.zip";
-	scp GalleryRemote.MacOSX.NoVM.tgz paour@jpmullan.com:remote/GalleryRemote.${version}.MacOSX.NoVM.tgz;
-	ssh paour@jpmullan.com "cp -pf remote/GalleryRemote.${version}.MacOSX.NoVM.tgz remote/current_GalleryRemote.MacOSX.NoVM.tgz";
+	ncftpput -f gallery2hu.cfg -C gallery_remote.zip gallery_remote_${version}.zip;
+	ncftpput -f gallery2hu.cfg -C gallery_remote.zip current_gallery_remote.zip;
+	ncftpput -f gallery2hu.cfg -C gallery_remote_applets.zip gallery_remote_applets_${version}.zip;
+	ncftpput -f gallery2hu.cfg -C gallery_remote_applets.zip current_gallery_remote_applets.zip;
+	ncftpput -f gallery2hu.cfg -C GalleryRemote.MacOSX.NoVM.tgz GalleryRemote.${version}.MacOSX.NoVM.tgz;
+	ncftpput -f gallery2hu.cfg -C GalleryRemote.MacOSX.NoVM.tgz current_GalleryRemote.MacOSX.NoVM.tgz;
 
 	echo -e "\n\nPosting new version info on version check site...\n\n";
 	ant post;