Fix install locations (#99)

GoogleCloudPlatform · May 2, 2017 · cd1b11b · cd1b11b
1 parent 183d49b
commit cd1b11b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/agent_install.ps1 b/agent_install.ps1
@@ -16,7 +16,7 @@ if (-not (Get-Service 'GCEAgent' -ErrorAction SilentlyContinue)) {
   New-Service -Name 'GCEAgent' -BinaryPathName 'C:\Program Files\Google\Compute Engine\agent\GCEWindowsAgent.exe' -StartupType Automatic -Description 'Google Compute Engine Agent'
 }
 
-$config = 'C:\Program Files\Google\Compute Engine\instance_configs.cfg'
+$config = "${env:ProgramFiles}\Google\Compute Engine\instance_configs.cfg"
 if (-not (Test-Path $config)) {
   @'
 # GCE Instance Configuration

diff --git a/auto_updater_install.ps1 b/auto_updater_install.ps1
@@ -23,7 +23,7 @@ $task.Principal.RunLevel = 1
 
 $action = $task.Actions.Create(0)
 $action.Path = 'powershell.exe'
-$action.Arguments = '-ExecutionPolicy Bypass -NonInteractive -NoProfile -File "C:\Program Files\Google\Compute Engine\tools\auto_updater.ps1"'
+$action.Arguments = '-ExecutionPolicy Bypass -NonInteractive -NoProfile -File "${env:ProgramFiles}\Google\Compute Engine\tools\auto_updater.ps1"'
 
 # Run task 5 minutes after boot, then every day indefinitely
 $boot_trigger = $task.Triggers.Create(8)

diff --git a/google-compute-engine-auto-updater.goospec b/google-compute-engine-auto-updater.goospec
@@ -1,6 +1,6 @@
 {
   "name": "google-compute-engine-auto-updater",
-  "version": "1.1.1@1",
+  "version": "1.1.1@2",
   "arch": "noarch",
   "authors": "Google Inc.",
   "license": "http://www.apache.org/licenses/LICENSE-2.0",

diff --git a/google-compute-engine-metadata-scripts.goospec b/google-compute-engine-metadata-scripts.goospec
@@ -1,6 +1,6 @@
 {
   "name": "google-compute-engine-metadata-scripts",
-  "version": "4.1.2@1",
+  "version": "4.1.2@2",
   "arch": "x86_64",
   "authors": "Google Inc.",
   "license": "http://www.apache.org/licenses/LICENSE-2.0",

diff --git a/google-compute-engine-powershell.goospec b/google-compute-engine-powershell.goospec
@@ -1,6 +1,6 @@
 {
   "name": "google-compute-engine-powershell",
-  "version": "1.0.0@2",
+  "version": "1.0.0@3",
   "arch": "noarch",
   "authors": "Google Inc.",
   "license": "http://www.apache.org/licenses/LICENSE-2.0",

diff --git a/google-compute-engine-sysprep.goospec b/google-compute-engine-sysprep.goospec
@@ -1,6 +1,6 @@
 {
   "name": "google-compute-engine-sysprep",
-  "version": "3.6.3@1",
+  "version": "3.6.3@2",
   "arch": "noarch",
   "authors": "Google Inc.",
   "license": "http://www.apache.org/licenses/LICENSE-2.0",

diff --git a/google-compute-engine-windows.goospec b/google-compute-engine-windows.goospec
@@ -1,6 +1,6 @@
 {
   "name": "google-compute-engine-windows",
-  "version": "4.1.1@1",
+  "version": "4.1.1@2",
   "arch": "x86_64",
   "authors": "Google Inc.",
   "license": "http://www.apache.org/licenses/LICENSE-2.0",

diff --git a/metadata_scripts_install.ps1 b/metadata_scripts_install.ps1
@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-$install_dir = "${env:ProgramFiles}\Compute Engine\metadata_scripts"
+$install_dir = "${env:ProgramFiles}\Google\Compute Engine\metadata_scripts"
 $machine_env = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
 
 $path = (Get-ItemProperty $machine_env).Path

diff --git a/metadata_scripts_uninstall.ps1 b/metadata_scripts_uninstall.ps1
@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-$install_dir = "${env:ProgramFiles}\Compute Engine\metadata_scripts"
+$install_dir = "${env:ProgramFiles}\Google\Compute Engine\metadata_scripts"
 $machine_env = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
 
 $path = (Get-ItemProperty $machine_env).Path

diff --git a/sysprep_install.ps1 b/sysprep_install.ps1
@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-$install_dir = "${env:ProgramFiles}\Compute Engine\sysprep"
+$install_dir = "${env:ProgramFiles}\Google\Compute Engine\sysprep"
 $machine_env = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
 
 $path = (Get-ItemProperty $machine_env).Path

diff --git a/sysprep_uninstall.ps1 b/sysprep_uninstall.ps1
@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-$install_dir = "${env:ProgramFiles}\Compute Engine\sysprep"
+$install_dir = "${env:ProgramFiles}\Google\Compute Engine\sysprep"
 $machine_env = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
 
 $path = (Get-ItemProperty $machine_env).Path