Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1028: Option to skip OS package manager's dependency check

ba63b01729 Option to skip OS package manager's dependency check (Kristaps Kaupe)

Pull request description:

  This is needed to be able to install on Debian and macOS using `install.sh` from user that does not have `sudo` permissions <ins>and for some reason user has all necessary dependencies on the machine but OS package manager this it does not</ins>.

  Noticed while migrating my RaspiBolt test setup from Raspberry Pi (which defaults to 32-bit Raspbian as OS) to Odroid-HC4 (which has 64-bit Ubuntu Server instead).

Top commit has no ACKs.

Tree-SHA512: 5be7b9ae04e5227dc386567baf6ad02b0dd77162cb31f81dbf55d5284437decd65c0ad01c7801f3a405735c1f49712811247146eea82bf9bc423bc92f5d2fdb8
master
Kristaps Kaupe 4 years ago
parent
commit
be88f9f976
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 20
      install.sh

20
install.sh

@ -60,7 +60,10 @@ deps_install ()
return 1 return 1
fi fi
if [[ ${install_os} == 'debian' ]]; then if [[ ${use_os_deps_check} != '1' ]]; then
echo "Checking OS package manager's dependencies disabled. Trying to build."
return 0
elif [[ ${install_os} == 'debian' ]]; then
deb_deps_install "${debian_deps[@]}" deb_deps_install "${debian_deps[@]}"
return "$?" return "$?"
elif [[ ${install_os} == 'darwin' ]]; then elif [[ ${install_os} == 'darwin' ]]; then
@ -336,6 +339,9 @@ parse_flags ()
--develop) --develop)
develop_build='1' develop_build='1'
;; ;;
--disable-os-deps-check)
use_os_deps_check='0'
;;
--disable-secp-check) --disable-secp-check)
use_secp_check='0' use_secp_check='0'
;; ;;
@ -370,11 +376,12 @@ Usage: "${0}" [options]
Options: Options:
--develop code remains editable in place (currently always enabled) --develop code remains editable in place (currently always enabled)
--disable-secp-check do not run libsecp256k1 tests (default is to run them) --disable-os-deps-check skip OS package manager's dependency check
--python, -p python version (only python3 versions are supported) --disable-secp-check do not run libsecp256k1 tests (default is to run them)
--with-qt build the Qt GUI --python, -p python version (only python3 versions are supported)
--without-qt don't build the Qt GUI --with-qt build the Qt GUI
--without-qt don't build the Qt GUI
" "
return 1 return 1
;; ;;
@ -437,6 +444,7 @@ main ()
# flags # flags
develop_build='' develop_build=''
python='python3' python='python3'
use_os_deps_check='1'
use_secp_check='1' use_secp_check='1'
with_qt='' with_qt=''
reinstall='false' reinstall='false'

Loading…
Cancel
Save