Changeset 620080

Timestamp:

11/01/2012 11:08:49 PM (13 years ago)

Author:

flashpixx

Message:

git download

File:

• repositoryzip/trunk/gitdownload.php (modified) (3 diffs)

repositoryzip/trunk/gitdownload.php

@@ -32 +32 @@
 // ==========================================================================
 
-
+    
 // create path and filenames
 $lcZipName      = tempnam(sys_get_temp_dir(), "gitzip_".$gitdata["hash"]);
-$lcGitName      = sys_get_temp_dir()."/gitzip_".$gitdata["hash"];
+$lcGitWorkDir   = sys_get_temp_dir()."/gitzip_".$gitdata["hash"];
 $lcGitDir       = $lcGitName."/.git";
 
-    
     
 // test if the directory exist, we do a git pull otherwise we do a clone
@@ -44 +43 @@
 if (is_dir($lcGitName))
 {
+    
     array_push($param, "--git-dir=".$lcGitDir);
+    array_push($param, "--work-tree=".$lcGitWorkDir);
     array_push($param, "pull");
-    array_push($param, "-f");
+    
+    if (!runcmd($gitdata["gitcmd"], $param))
+        die("error on fetching git repository");  
+    
 } else {
+    
     array_push($param, "clone");
     array_push($param, $gitdata["url"]);
-    array_push($param, $lcGitName);
+    array_push($param, $lcGitWorkDir);
      
     // set branch / tag
     if ( ($gitdata["type"] == "tag") || ($gitdata["type"] == "branch") )
         array_push($param, "-b".$gitdata["name"]);
+    
+    if (!runcmd($gitdata["gitcmd"], $param))
+        die("error on cloning git repository");
+    
+    if (!empty($gitdata["version"])) 
+    {
+        $param = array();
+        array_push($param, "--git-dir=".$lcGitDir);
+        array_push($param, "--work-tree=".$lcGitWorkDir);
+        array_push($param, "checkout");
+        array_push($param, $gitdata["version"]);
+        
+        if (!runcmd($gitdata["gitcmd"], $param))
+            die("commit can not be checked out");
+    }
+    
 }
-         
-if (!runcmd($gitdata["gitcmd"], $param))
-    die("error on cloning / pulling git repository");
-    
-// if version not empty, check out the special version (only on cloning, after that we do not
-// need this again, because a version can not be modified without changes the hash)
-if (!empty($gitdata["version"]) && ($param[0] == "clone"))
-    if (!runcmd($gitdata["gitcmd"], array("--git-dir=".$lcGitDir, "checkout", $gitdata["version"], "-f")))
-        die("commit can not be checked out");
     
     
@@ -72 +84 @@
 if ($zip->open($lcZipName, ZIPARCHIVE::CREATE) !== true)
     die("zip file can not be created");
-addFiles2Zip($lcGitName, $lcGitName, $zip);
+addFiles2Zip($lcGitWorkDir, $lcGitWorkDir, $zip);
 $zip->close();
 sendBinaryFile($lcZipName, $gitdata["downloadtext"].".zip");