From 057d7e7e877994a29464de6d1cd69e310eaa6905 Mon Sep 17 00:00:00 2001
From: Luke Sampson <me@lukesampson.com>
Date: Thu, 30 Mar 2017 15:14:20 +1100
Subject: [PATCH] Suggested persist changes (see #1410)

---
 php.json  | 15 ++++++++-------
 ruby.json |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/php.json b/php.json
index ea501b71f6..272cae1c7f 100644
--- a/php.json
+++ b/php.json
@@ -28,20 +28,21 @@
         "php.exe",
         "php-cgi.exe"
     ],
+    "persist": "conf",
     "env_set": {
-        "PHP_INI_SCAN_DIR": "$persist_dir\\conf"
+        "PHP_INI_SCAN_DIR": "$dir\\conf"
     },
     "post_install": "
-#Copy ini scan dir from old location before persistant update
-if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$persist_dir\\conf\")) {
-    Write-Host -ForegroundColor Cyan 'We are moving your php configuration to scoop/persist/php/conf'
-    Move-Item \"$dir\\..\\conf\" \"$persist_dir\\conf\"
+# Copy ini scan dir from old location before persistent update
+if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\conf\")) {
+    Write-Host -ForegroundColor Cyan 'We are moving your php configuration to $dir\\conf'
+    Move-Item \"$dir\\..\\conf\" \"$dir\\conf\"
 }
 
-#Copy PHP configuration file to expected location
+# Copy PHP configuration file to expected location
 cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"
 
-#Enable extensions to be found in installation-relative folder (the default is to search C:/php)
+# Enable extensions to be found in installation-relative folder (the default is to search C:/php)
 (gc \"$dir\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\php.ini\"
 ",
     "checkver": {
diff --git a/ruby.json b/ruby.json
index 837e691dc6..276b341576 100644
--- a/ruby.json
+++ b/ruby.json
@@ -26,10 +26,11 @@
         }
     },
     "extract_to": [ "", "devkit" ],
-    "env_add_path": ["bin", "$persist_dir\\gem\\bin"],
+    "persist": "gems",
+    "env_add_path": [ "bin", "gems\\bin" ],
     "env_set": {
-        "GEM_HOME": "$persist_dir\\gem",
-        "GEM_PATH": "$persist_dir\\gem"
+        "GEM_HOME": "$dir\\gems",
+        "GEM_PATH": "$dir\\gems"
     },
     "post_install": "pushd $dir\\devkit;echo \"---`n- $dir\" | out-file config.yml -enc default; ruby dk.rb install;popd;",
     "checkver": {