Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ jobs:
runs-on: [self-hosted, linux]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1
fetch-tags: false
clean: true
ref: ${{ github.ref }}

- name: Set up Python 3.9
uses: actions/setup-python@v4
Expand Down Expand Up @@ -53,7 +56,7 @@ jobs:
# run: poetry run black . --check

- name: Test with pytest
run: poetry run pytest -m "not skip_ci" tests
run: poetry run pytest -q

# - name: Vulnerability check
# run: poetry run safety check
9 changes: 7 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ jobs:
runs-on: [self-hosted, linux]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
# Ensure we only fetch the current ref, and avoid fetching tags to prevent
# 'would clobber existing tag' on self-hosted runners with cached repos
fetch-depth: 1
fetch-tags: false
clean: true
ref: ${{ github.ref }}

- name: Set up Python 3.9
uses: actions/setup-python@v4
Expand All @@ -53,7 +58,7 @@ jobs:


- name: Test with pytest
run: poetry run pytest -m "not skip_ci" tests
run: poetry run pytest -q


- name: Build package
Expand Down
5 changes: 4 additions & 1 deletion rnsh/listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,10 @@ async def listen(configdir, command, identitypath=None, service_name=None, verbo
except Exception as e:
log.error(f"Error looking up shell: {e}")
log.info(f"Using {shell} for default command.")
_cmd = [shell] if shell else None
# Ensure a sane shell default. Fall back to /bin/sh if lookup fails.
if not shell or len(shell) == 0:
shell = "/bin/sh"
_cmd = [shell]
else:
log.info(f"Using command {shlex.join(_cmd)}")

Expand Down
2 changes: 1 addition & 1 deletion rnsh/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def stderr(data: bytes):

try:
self.process = process.CallbackSubprocess(argv=self.cmdline,
env={"TERM": self.term or os.environ.get("TERM", None),
env={"TERM": self.term or os.environ.get("TERM") or "xterm",
"RNS_REMOTE_IDENTITY": (RNS.prettyhexrep(self.remote_identity.hash)
if self.remote_identity and self.remote_identity.hash else "")},
loop=self.loop,
Expand Down