Merge pull request #299 from Azure/clu

Clu

Author: huangpf

src/CLU/Microsoft.CLU.Common/CLUEnvironment.cs

@@ -107,6 +107,27 @@ public static string CLRName
             }
         }
 
+        /// <summary>
+        /// Get the home path according to the platform...
+        /// </summary>
+        /// <returns></returns>
+        private static string GetHomePath()
+        {
+            if (Platform.IsWindows)
+            {
+                string[] items = {
+                        GetEnvironmentVariable("USERPROFILE"),
+                        GetEnvironmentVariable("HOMEDRIVE") + GetEnvironmentVariable("HOMEPATH")
+                    };
+
+                return items.First((s) => !String.IsNullOrEmpty(s));
+            }
+            else
+            {
+                return GetEnvironmentVariable("HOME");
+            }
+        }
+
         /// <summary>
         /// Keeps the script name used to invoke a command, e.g. 'azure'.
         /// </summary>
@@ -169,7 +190,7 @@ internal static void SetEnvironmentVariable(string envVariableName, string value
         {
             if (IsThreadSafe)
             {
-                lock(_cacheLock)
+                lock (_cacheLock)
                 {
                     _cache[envVariableName] = value;
                 }
@@ -281,25 +302,27 @@ public static class Session
             /// <summary>
             /// Gets the current session ID.
             /// </summary>
-            public static string ID { get; private set;  }
+            private static string ID { get; set; }
 
             /// <summary>
-            /// The backing field for Directory property.
+            /// The backing field for SessionPath property.
             /// </summary>
-            private static string _directory;
+            private static string _path;
             /// <summary>
             /// The directory to store session specific resources.
             /// </summary>
-            public static string Directory
+            public static string SessionPath
             {
                 get
                 {
-                    if (_directory == null)
+                    if (_path == null)
                     {
-                        _directory = System.IO.Directory.CreateDirectory(Path.Combine(CLUEnvironment.GetRootPath(), "sessions", $"session_{ID}")).FullName;
+                        var directory = Path.Combine(CLUEnvironment.GetHomePath(), ".azure");
+                        System.IO.Directory.CreateDirectory(directory);
+                        _path = Path.Combine(directory, $"{ID}.profile.json");
                     }
 
-                    return _directory;
+                    return _path;
                 }
             }
 
@@ -313,21 +336,7 @@ static Session()
                 ID = Environment.GetEnvironmentVariable(Constants.SessionID);
                 if (string.IsNullOrEmpty(ID))
                 {
-                    if (Platform.IsWindows)
-                    {
-                        var ancestorProcessId = Windows.Process.GetPPID();
-                        ID = Convert.ToString(ancestorProcessId);
-                    }
-                    else if (Platform.IsUnixOrMacOSX)
-                    {
-                        var processGroupId = Unix.Process.GetPGRP();
-                        ID = Convert.ToString(processGroupId);
-                    }
-                    else
-                    {
-                        // Unknown platform - use global session
-                        ID = Constants.GlobalSessionID;
-                    }
+                    ID = Constants.DefaultSessionID;
 
                     Environment.SetEnvironmentVariable(Constants.SessionID, ID);
                 }

src/CLU/Microsoft.CLU.Common/Constants.cs

@@ -212,12 +212,12 @@ public static class Constants
         /// <summary>
         /// The environment variable holding current session ID.
         /// </summary>
-        internal const string SessionID = "CmdletSessionID";
+        internal const string SessionID = "AzureProfile";
 
         /// <summary>
-        /// The global session ID.
+        /// The default session ID.
         /// </summary>
-        internal const string GlobalSessionID = "global";
+        internal const string DefaultSessionID = "default";
 
         #endregion
     }

src/CLU/Microsoft.CLU.Run/PackageManagementMode.cs

@@ -543,10 +543,6 @@ private static void GenerateScript(string cfgPath)
                 File.WriteAllLines(scriptPath, new string[]
                 {
                     "#!/bin/bash",
-                    "if [ -z ${CmdletSessionID} ]",
-                    "then",
-                    "  export CmdletSessionID=$PPID",
-                    "fi",
                     "SCRIPTPATH=$(dirname \"$0\")",
                     $"$SCRIPTPATH/clurun -s {scriptName} -r $SCRIPTPATH/{Path.GetFileName(cfgPath)} \"$@\""
                 });

src/CLU/Microsoft.CLU/System.Management.Automation/SessionState.cs

@@ -17,7 +17,7 @@ public sealed class SessionState
         public SessionState()
         {
             PSVariable = new PSVariableIntrinsics();
-            _stateFileFullPath = System.IO.Path.Combine(CLUEnvironment.Session.Directory, "session.state.json");
+            _stateFileFullPath = CLUEnvironment.Session.SessionPath;
         }
 
         /// <summary>