From c7dfb6a419685039caafd3639a29761aa5e22ee1 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sat, 4 Mar 2023 18:16:39 -0500 Subject: [PATCH] Fixed location of Bash completions script on FreeBSD Former-commit-id: b748400bfe2e1f0f2a3635236a7273f434ae193b Former-commit-id: b5b31147f3de254e53da92191597fd4c9d5cb53b --- lib/sshyp.py | 2 +- package.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sshyp.py b/lib/sshyp.py index 72dee49..79baeb0 100755 --- a/lib/sshyp.py +++ b/lib/sshyp.py @@ -36,7 +36,7 @@ def entry_list_gen(_directory=f"{home}/.local/share/sshyp/"): # generates and p elif _ran: print('\u001b[38;5;9m-empty directory-\u001b[0m\n') _ran = True - + def entry_reader(_decrypted_entry): # displays the contents of an entry in a readable format _entry_lines, _notes_flag = open(_decrypted_entry, 'r').readlines(), 0 diff --git a/package.sh b/package.sh index fdac241..ff61bbc 100755 --- a/package.sh +++ b/package.sh @@ -209,7 +209,7 @@ echo -e "\nFedora packaging complete\n" _create_freebsd_pkg() { echo -e '\npackaging for FreeBSD...' - mkdir -p output/freebsdtemp/usr/{lib/sshyp/extensions,bin,share/{bash-completion/completions,man/man1}} + mkdir -p output/freebsdtemp/usr/{lib/sshyp/extensions,bin,share/man/man1,local/share/bash-completion/completions} echo "name: sshyp version: \""$version"\" abi = \"FreeBSD:13:*\"; @@ -246,7 +246,7 @@ echo "/usr/bin/sshyp cp -r lib/. output/freebsdtemp/usr/lib/sshyp/ ln -s /usr/lib/sshyp/sshyp.py output/freebsdtemp/usr/bin/sshyp cp -r share output/freebsdtemp/usr/ -cp extra/sshyp-completion.bash output/freebsdtemp/usr/share/bash-completion/completions/sshyp +cp extra/sshyp-completion.bash output/freebsdtemp/usr/local/share/bash-completion/completions/sshyp cp extra/manpage output/freebsdtemp/usr/share/man/man1/sshyp.1 gzip output/freebsdtemp/usr/share/man/man1/sshyp.1 pkg create -m output/freebsdtemp/ -r output/freebsdtemp/ -p output/freebsdtemp/plist -o output/