From 0904a6bb6b7c39a36c301599a840f7b147965eca Mon Sep 17 00:00:00 2001 From: Oliver Morgan Date: Wed, 19 Oct 2022 11:53:02 +0100 Subject: [PATCH 1/2] Update lib.rb --- lib/zbar/lib.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/zbar/lib.rb b/lib/zbar/lib.rb index 8fc9a65..14ad404 100644 --- a/lib/zbar/lib.rb +++ b/lib/zbar/lib.rb @@ -5,7 +5,8 @@ module ZBar paths = Array( ENV['ZBAR_LIB'] || - Dir[search_string] + Dir[search_string] || + 'zbar' ) begin ffi_lib(*paths) From 652301cd079bfc097989f2dcde59abfa746f502b Mon Sep 17 00:00:00 2001 From: Oliver Morgan Date: Wed, 19 Oct 2022 11:56:58 +0100 Subject: [PATCH 2/2] Update lib.rb --- lib/zbar/lib.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/zbar/lib.rb b/lib/zbar/lib.rb index 14ad404..462218b 100644 --- a/lib/zbar/lib.rb +++ b/lib/zbar/lib.rb @@ -2,12 +2,12 @@ module ZBar extend FFI::Library search_string = '/{opt,usr}/{,local/}lib{,64}/{,x86_64-linux-gnu/,i386-linux-gnu/}libzbar.{dylib,so*}' - paths = - Array( - ENV['ZBAR_LIB'] || - Dir[search_string] || - 'zbar' - ) + paths = Dir[search_string] + + if paths.empty? + paths = [ENV['ZBAR_LIB'] || 'zbar'] + end + begin ffi_lib(*paths) rescue LoadError => le