From e98ca4f7d28c12fc1cfead20fd774e30eb7ff52a Mon Sep 17 00:00:00 2001
From: xq114 <1140735506@qq.com>
Date: Wed, 28 Apr 2021 14:13:38 +0800
Subject: improve environment

---
 scripts/xrepo-hook.psm1 | 8 ++++----
 scripts/xrepo.ps1       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/xrepo-hook.psm1 b/scripts/xrepo-hook.psm1
index e0a872823..ca63fb09b 100644
--- a/scripts/xrepo-hook.psm1
+++ b/scripts/xrepo-hook.psm1
@@ -3,7 +3,7 @@
 
 <#
     .SYNOPSIS
-        Activates a xrepo environment based on your current project.
+        Enter a xrepo environment based on your current project.
 
     .EXAMPLE
         Enter-XrepoEnvironment
@@ -14,8 +14,8 @@ function Enter-XrepoEnvironment {
 
     begin {
         $script:xrepoOldEnvs = (Get-ChildItem -Path Env:);
-        $xrepoPrompt = (& $Env:XMAKE_EXE lua private.xrepo env --info prompt | Out-String);
-        $activateCommand = (& $Env:XMAKE_EXE lua private.xrepo env --info script.powershell | Out-String);
+        $xrepoPrompt = (& $Env:XMAKE_EXE lua private.xrepo.action.env.info prompt | Out-String);
+        $activateCommand = (& $Env:XMAKE_EXE lua private.xrepo.action.env.info script.powershell | Out-String);
 
         Write-Verbose "[xrepo env script.powershell]`n$activateCommand";
         Invoke-Expression -Command $activateCommand;
@@ -29,7 +29,7 @@ function Enter-XrepoEnvironment {
 
 <#
     .SYNOPSIS
-        Deactivates the current xrepo environment, if any.
+        Exit the current xrepo environment, if any.
 
     .EXAMPLE
         Exit-XrepoEnvironment
diff --git a/scripts/xrepo.ps1 b/scripts/xrepo.ps1
index d0d3c851e..84bb4f000 100644
--- a/scripts/xrepo.ps1
+++ b/scripts/xrepo.ps1
@@ -11,9 +11,9 @@ if ($Args.Count -eq 0) {
     if (($Command -eq "env") -and ($Args.Count -ge 2)) {
         switch ($Args[1]) {
             "shell" {
-                if (-not (Test-Path 'Env:XMAKE_ROOT')) {
-                    $Env:XMAKE_ROOT = $BASE_DIR;
-                    Import-Module "$Env:XMAKE_ROOT\scripts\xrepo-hook.psm1";
+                if (-not (Test-Path 'Env:XMAKE_ROOTDIR')) {
+                    $Env:XMAKE_ROOTDIR = $BASE_DIR;
+                    Import-Module "$Env:XMAKE_ROOTDIR\scripts\xrepo-hook.psm1";
                     Add-XrepoEnvironmentToPrompt;
                 }
                 if ((Test-Path 'Env:XMAKE_PROMPT_MODIFIER') -and ($Env:XMAKE_PROMPT_MODIFIER -ne "")) {
@@ -22,7 +22,7 @@ if ($Args.Count -eq 0) {
                 Enter-XrepoEnvironment;
                 return;
             }
-            "deactivate" {
+            "quit" {
                 Exit-XrepoEnvironment;
                 return;
             }
-- 
cgit v1.3.1