[Clipart] r34 - makerelease

[noreply at openclipart.org]

Author: jstaerk
Date: Sun Mar 29 07:11:47 2009
New Revision: 34

Log:
updated for rc4 which presumably will be RTM

Modified:
   makerelease/downloader.php

Modified: makerelease/downloader.php
==============================================================================
--- makerelease/downloader.php	Sun Mar 29 04:09:40 2009	(r33)
+++ makerelease/downloader.php	Sun Mar 29 07:11:47 2009	(r34)
@@ -378,11 +378,10 @@
 	 * will return 1 for OK, 0 for try again and -1 for not ok
 	 * */
 	private function checkAndInsertLink($toWhere) {
-		$possible=($toWhere>0)&&($toWhere<=count($this->images));
+		$possible=($toWhere>0)&&($toWhere<=$this->numPages);
 		if (!$possible) {
 			return -1;			
-		}
-		if (in_array($toWhere, $this->pagesLinked)) {
+		} else if (in_array($toWhere, $this->pagesLinked)) {
 			return 0;
 		} else {
 			$this->pagesLinked[]=$toWhere;
@@ -737,30 +736,30 @@
 		chdir("..");
 		$this->HTMLpreview->writeHTML(getcwd().$this->opsysDirSep."openclipart".$this->opsysDirSep);
 		$this->logger->shoutNewStatus("Taring");
-		$tarFile="openclipart{$this->version}.tar";
+		$tarFile="openclipart-{$this->version}.tar";
 		if (file_exists($tarFile)) {
 			unlink($tarFile);
 		}
 		$this->myExec($this->path_tar,"cvf $tarFile openclipart");
 		$this->logger->shoutNewStatus("BZipping");
-		$bzFile="openclipart{$this->version}.tar.bz2";
+		$bzFile="openclipart-{$this->version}.tar.bz2";
 		if (file_exists($bzFile)) {
 			unlink($bzFile);
 		}
 		$this->myExec($this->path_bzip,"-k $tarFile");
 		$this->logger->shoutNewStatus("GZipping");
-		$tgzFile="openclipart{$this->version}.tar.gz";
+		$tgzFile="openclipart-{$this->version}.tar.gz";
 		if (file_exists($tgzFile)) {
 			unlink($tgzFile);
 		}
 		$this->myExec($this->path_gzip,$tarFile);
 		
 		$this->logger->shoutNewStatus("Zipping");
-		$zipFile="openclipart{$this->version}.zip";
+		$zipFile="openclipart-{$this->version}.zip";
 		if (file_exists($zipFile)) {
 			unlink($zipFile);
 		}
-		$this->myExec($this->path_zip,"-r openclipart{$this->version}.zip openclipart");
+		$this->myExec($this->path_zip,"-r $zipFile openclipart");
 		if ($this->doRsync) {
 			$this->logger->shoutNewStatus("Uploading");
 			$sourceDir=getcwd();