Skip to content

Gershwin add support for /Users and zsh #84

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
ericbsd merged 2 commits into from
Jul 12, 2025
Merged

Gershwin add support for /Users and zsh #84

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7dbd96
Changes to impliment Users folder detection on the correct file for g…
pkgdemon Jul 12, 2025
c983bc7
Forgot to import os
pkgdemon Jul 12, 2025
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
11 changes: 9 additions & 2 deletions src/add_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python

from gi.repository import Gtk, Gdk
import os
import pickle
from gbi_common import password_strength
from sys_handler import set_admin_user
Expand Down Expand Up @@ -29,7 +30,10 @@ def save_selection(self):
name = self.name.get_text()
up = self.password.get_text()
shell = self.sh
hf = f'/home/{uname}'
if os.path.isdir('/Users'):
hf = f'/Users/{uname}'
else:
hf = f'/home/{uname}'
hst = f'{uname}-ghostbsd'
ul = [uname, name, up, shell, hf, hst]
pickle.dump(ul, uf)
Expand Down Expand Up @@ -114,7 +118,10 @@ def __init__(self, button3):
self.repassword.connect("changed", self.password_verification, button3)
self.label5 = Gtk.Label(label="Shell")
shell = Gtk.ComboBoxText()
self.sh = '/usr/local/bin/fish'
if os.path.isdir('/Users'):
self.sh = '/usr/local/bin/zsh'
else:
self.sh = '/usr/local/bin/fish'
# Keeping this code for future project example.
shell.append_text('sh')
shell.append_text('csh')
Expand Down