Thread: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[62621] trim (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 62621
          http://sourceforge.net/p/tikiwiki/code/62621
Author:   sokoloski
Date:     2017-05-16 23:22:03 +0000 (Tue, 16 May 2017)
Log Message:
-----------
[FIX] Seems these changes were lost/reverted?

Modified Paths:
--------------
    trim/Makefile
    trim/scripts/clone.php

Modified: trim/Makefile
===================================================================

--- trim/Makefile	2017-05-16 18:05:56 UTC (rev 62620)
+++ trim/Makefile	2017-05-16 23:22:03 UTC (rev 62621)
@@ -9,10 +9,10 @@
 # No changes should be required from here
 default:
 	@echo "Valid options are:"
-	@echo "  access, backup, blank, clean, check, clone, cloneandupdate,"
-	@echo "  cloneandupgrade, convert, copysshkey, delete, detect, enablewww,"
-	@echo "  fix, instance, mirror, profile, report, restore, update, upgrade,"
-	@echo "  verify, viewdb, watch"
+	@echo "  access, backup, blank, clean, check, clone, cloneandupgrade,"
+	@echo "  convert, copysshkey, delete, detect, enablewww, fix, instance,"
+	@echo "  profile, report, restore, update, upgrade, verify, viewdb,"
+	@echo "  watch"
 
 help: default
 
@@ -82,9 +82,11 @@
 	@$(PHP) scripts/copysshkey.php
 
 clone:
-# The argument ("clone") is ignored since 2017-03-24. Could be removed or replaced.
 	@$(PHP) scripts/clone.php clone
 
+cloneandupgrade:
+	@$(PHP) scripts/clone.php upgrade
+
 debug:
 	@$(PHP) scripts/debug.php
 

Modified: trim/scripts/clone.php
===================================================================
--- trim/scripts/clone.php	2017-05-16 18:05:56 UTC (rev 62620)
+++ trim/scripts/clone.php	2017-05-16 23:22:03 UTC (rev 62621)
@@ -7,14 +7,70 @@
 include_once dirname(__FILE__) . '/../src/env_setup.php';
 include_once dirname(__FILE__) . '/../src/dbsetup.php';
 
-/*
- * TODO: Allow defining whether the data, the code or both should be copied. Since there is possibly no safe default which is sure not to go against the user's expectation, there should be a mandatory argument ("code", "data" or "both"). 
- */
+define('ARG_MODE_CLONE',
+    $_SERVER['argc'] == 2 && $_SERVER['argv'][1] == 'clone');
+define('ARG_MODE_CLONE_UPGRADE',
+    $_SERVER['argc'] == 2 && $_SERVER['argv'][1] == 'upgrade');
 
+// TODO: This function is mostly a copy of the code found in src/dbsetup.php:
+// perform_instance_installation().  It should be called from an app-aware method
+// (tiki, wordpress, etc).
+function getUpgradeVersion($instance)
+{
+    $found_incompatibilities = false;
+    $instance->detectPHP();
+
+    echo "Which version do you want to upgrade to?\n";
+
+    $app = $instance->getApplication();
+
+    $versions = $app->getVersions();
+    foreach ($versions as $key => $version) {
+
+        preg_match('/(\d+\.|trunk)/', $version->branch, $matches);
+        if (array_key_exists(0, $matches)) {
+            if ((($matches[0] >= 13) || ($matches[0] == 'trunk')) &&
+                ($instance->phpversion < 50500)) {
+                // Nothing to do, this match is incompatible...
+                $found_incompatibilities = true;
+            }
+            else {
+                echo sprintf("[%3d] %s : %s\n",
+                    $key, $version->type, $version->branch);
+            }
+        }
+    }
+    
+    echo "[ -1] blank : none\n";
+
+    $matches = array();
+    preg_match('/(\d+)(\d{2})(\d{2})$/', $instance->phpversion, $matches);
+
+    if (count($matches) == 4) {
+        info(sprintf('We detected PHP release: %d.%d.%d',
+            $matches[1], $matches[2], $matches[3]));
+    }
+
+    if ($found_incompatibilities) {
+        echo "If some versions are not offered, it's likely because the host " .
+            "server doesn't meet the requirements for that version (ex: PHP version is too old)\n";
+    }
+
+    $input = promptUser('>>> ');
+    $entries = getEntries($versions, $input);
+    
+    return $entries[0];
+}
+
+if (! ARG_MODE_CLONE && ! ARG_MODE_CLONE_UPGRADE ) {
+    echo color("No mode supplied (clone, or upgrade).\n", 'red');
+    exit(1);
+}
+
 $instances = Instance::getInstances();
 
 if (! isset($_SERVER['argv'][2])) {
-    echo color("\nNOTE: Clone/mirror operations are only available on Local and SSH instances.\n\n", 'yellow');
+    echo color("\nNOTE: Clone operations are only available on Local and SSH instances.\n\n", 'yellow');
 
     $src_selection = selectInstances(
         $instances, "Select the source instance:\n" );
@@ -52,6 +108,16 @@
     );
 }
 
+if (ARG_MODE_CLONE_UPGRADE) {
+    if (! isset($_SERVER['argv'][3])) {
+        $upgrade_version = getUpgradeVersion($src_selection[0]);
+    }
+    else {
+        // TODO: This should be sanity checked.
+        $upgrade_version = buildFake('svn', $_SERVER['argv'][3]);
+    }
+}
+
 info("Creating snapshot of: {$src_selection[0]->name}");
 $archive = $src_selection[0]->backup();
 
@@ -60,9 +126,17 @@
     exit(1);
 }
 
+$app = $src_selection[0]->getApplication();
+
 foreach ($dst_selection as $dst_instance) {
-    info("Initiating clone/mirror of {$src_selection[0]->name} to {$dst_instance->name}");
+    info("Initiating clone of {$src_selection[0]->name} to {$dst_instance->name}");
     $dst_instance->restore($src_selection[0]->app, $archive, true);
+
+    if (ARG_MODE_CLONE_UPGRADE) {
+        info("Upgrading to version: {$upgrade_version->branch}");
+        $app = $dst_instance->getApplication();
+        $app->performUpgrade($dst_instance, $upgrade_version, false);
+    }
 }
 
 exit(0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[62621] trim (Page 4)

The Free / Libre / Open Source Web App with the most built-in features

tikiwiki-cvs