Skip to content

support alternate architectures and improve error println #62

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.

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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: 4 additions & 3 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,12 @@ chmod +x "$PAM_WSL_HELLO_WINPATH/WindowsHelloBridge.exe"

set +x
echo_stage "Installing PAM module to the Linux system..."
SECURITY_PATH="/lib/x86_64-linux-gnu/security"
ARCH="$(uname -m)"
SECURITY_PATH="/lib/$ARCH-linux-gnu/security"
if ! check_pam_directory "${SECURITY_PATH}"; then
echo "PAM directory was not found in '/lib/x86_64-linux-gnu/security/'. It looks like you're not running Ubuntu nor Debian."
echo "PAM directory was not found in '$SECURITY_PATH'. It looks like you're not running Ubuntu nor Debian."
echo "Checking '/lib/security/'..."
SECURITY_PATH="/lib/security"
SECURITY_PATH="/lib/security"
while ! check_pam_directory "${SECURITY_PATH}"; do
echo "PAM module directory was not found in '${SECURITY_PATH}'."
echo "Please input the path of the PAM module's directory."
Expand Down
6 changes: 5 additions & 1 deletion win_hello_bridge/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ fn main() {
};

if let Err(e) = result() {
println!("Error: {}", e);
if let FailureReason::Other(e) = e {
println!("Error: {}", e.message());
} else {
println!("Error: {}", e);
}

if prompt_to_exit {
println!("Hit Enter key to terminate...");
Expand Down