Skip to content

Add support for detecting and doing the right thing for Gershwin users #83

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

Closed
pkgdemon wants to merge 5 commits into from
Closed

Add support for detecting and doing the right thing for Gershwin users #83

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86eedd3
Add support for detecting and doing the right thing for Gershwin users
pkgdemon Jul 11, 2025
770f841
Remove shell_default to address review
pkgdemon Jul 12, 2025
dc27140
Remove another shell_default to address review
pkgdemon Jul 12, 2025
e4b7a1f
Address sourcery review for path check
pkgdemon Jul 12, 2025
6873f47
Changes to fix sorcery suggested fix
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
13 changes: 10 additions & 3 deletions src/add_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from gi.repository import Gtk, Gdk
import pickle
import os
from gbi_common import password_strength

# Directory use from the installer.
Expand All @@ -26,7 +27,10 @@ def save_selection(self):
name = self.name.get_text()
up = self.password.get_text()
shell = self.sh
hf = '/home/%s' % self.user.get_text()
if os.path.isdir('/Users'):
hf = '/Users/%s' % self.user.get_text()
else:
hf = '/home/%s' % self.user.get_text()
hst = self.host.get_text()
ul = [uname, name, up, shell, hf]

Expand Down Expand Up @@ -86,7 +90,11 @@ def __init__(self, button3):
self.repassword.connect("changed", self.password_verification, button3)
self.label5 = Gtk.Label("Shell")
shell = Gtk.ComboBoxText()
self.sh = '/usr/local/bin/fish'
try:
open('/Users')
self.sh = '/usr/local/bin/zsh'
except:
Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot Jul 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (code-quality): Use except Exception: rather than bare except: (do-not-use-bare-except)

Suggested change
except:
except Exception:

self.sh = '/usr/local/bin/fish'
shell.append_text('sh')
shell.append_text('csh')
shell.append_text('tcsh')
Expand All @@ -95,7 +103,6 @@ def __init__(self, button3):
shell.append_text('rbash')
shell.append_text('ksh')
shell.append_text('zsh')
shell.set_active(3)
shell.connect("changed", self.on_shell)
label = Gtk.Label('<b>Set Hostname</b>')
label.set_use_markup(True)
Expand Down