Skip to content

Set %DesktopDir% as the default path if the Windows variable is unknown #213

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

Open
glinkinvd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Set %DesktopDir% as the default path if the Windows variable is unknown #213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions gpoa/util/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import ipaddress
import netifaces
import random
import re

class smbcreds (smbopts):

Expand Down Expand Up @@ -327,9 +328,11 @@ def expand_windows_var(text, username=None):

result = text
for var in variables.keys():
result = result.replace('%{}%'.format(var),
variables[var] if variables[var][-1] == '/'
else variables[var] +'/')
if var in result:
result = result.replace('%{}%'.format(var), variables[var] if variables[var][-1] == '/' else variables[var] +'/')
else:
default_path = re.sub(r'%[^%]+%', f"%{var}%", result)
return default_path.replace('%{}%'.format(var), variables['DesktopDir'] if variables['DesktopDir'][-1] == '/' else variables['DesktopDir'] +'/')

return result

Expand Down