Skip to content

fix alias #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markcowl merged 3 commits into from
Aug 24, 2018
Merged

fix alias #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0436e55
fix alias
Aug 24, 2018
fb910a9
add resource string
Aug 24, 2018
1df60d2
change exception type
Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/AliasHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,22 @@ public static string GetProfilePath(string Scope, SessionState sessionState)
var userprofile = "";
if (Scope != null && Scope.Equals("CurrentUser"))
{
var editionType = sessionState.PSVariable.GetValue("PSEdition") as string;
var psFolder = string.Equals(editionType, "Desktop", StringComparison.OrdinalIgnoreCase) ? "WindowsPowerShell" : "PowerShell";
userprofile = Path.Combine(sessionState.PSVariable.GetValue("env:USERPROFILE").ToString(), "Documents", psFolder, "profile.ps1");
var powershellProfile = sessionState.PSVariable.GetValue("PROFILE") as PSObject;
if (powershellProfile == null || !powershellProfile.Members.ToList().Any(a => a.Name.Equals("CurrentUserAllHosts")))
{
throw new PSInvalidOperationException(string.Format(Properties.Resources.ProfilePathNull, "PROFILE.CurrentUserAllHosts"));
}
userprofile = powershellProfile.Members.ToList().Where(a => a.Name.Equals("CurrentUserAllHosts")).First().Value.ToString();
}

else if (Scope != null && Scope.Equals("LocalMachine"))
{
userprofile = Path.Combine(sessionState.PSVariable.GetValue("PSHOME").ToString(), "profile.ps1");
var powershellProfile = sessionState.PSVariable.GetValue("PROFILE") as PSObject;
if (powershellProfile == null || !powershellProfile.Members.ToList().Any(a => a.Name.Equals("AllUsersAllHosts")))
{
throw new PSInvalidOperationException(string.Format(Properties.Resources.ProfilePathNull, "PROFILE.AllUsersAllHosts"));
}
userprofile = powershellProfile.Members.ToList().Where(a => a.Name.Equals("AllUsersAllHosts")).First().Value.ToString();
}

return userprofile;
Expand Down
9 changes: 9 additions & 0 deletions src/ResourceManager/Profile/Commands.Profile/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/ResourceManager/Profile/Commands.Profile/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,4 +420,7 @@
<data name="AliasImportFailure" xml:space="preserve">
<value>LocalMachine scope can only be set in PowerShell administrative mode.</value>
</data>
<data name="ProfilePathNull" xml:space="preserve">
<value>Unable to set profile because environment variable '${0}' is null.</value>
</data>
</root>