bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skip unavailable dependencies

Browse Source
This commit is contained in:
Bryan Roessler
2024-11-12 13:10:57 -05:00
parent d22e0ead04
commit 3c8b230cc3
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openwrtbuilder
View File

@@ -101,8 +101,8 @@ init() {
# Set distro-specific functions # Set distro-specific functions
case "$ID" in case "$ID" in
fedora|centos) pkg_install(){ sudo "$RPM_MGR" install -y "$@"; } ;; fedora|centos) pkg_install(){ sudo "$RPM_MGR" install --skip-unavailable -y "$@"; } ;;
debian|ubuntu) pkg_install(){ sudo apt-get install -y -q0 "$@"; } ;; debian|ubuntu) pkg_install(){ sudo apt-get install --ignore-missing -y -q0 "$@"; } ;;
suse) pkg_install(){ sudo zypper --non-interactive -q install --force --no-confirm "$@"; } ;; suse) pkg_install(){ sudo zypper --non-interactive -q install --force --no-confirm "$@"; } ;;
arch) pkg_install(){ sudo pacman -S --noconfirm --needed "$@"; } ;; arch) pkg_install(){ sudo pacman -S --noconfirm --needed "$@"; } ;;
esac esac
@@ -182,7 +182,6 @@ install_dependencies() {
"wget" "wget"
"which" "which"
"diffutils" "diffutils"
"python2"
"python3" "python3"
"python3-setuptools" "python3-setuptools"
"python3-pyelftools" "python3-pyelftools"
@@ -316,7 +315,6 @@ install_dependencies() {
get_imagebuilder() { get_imagebuilder() {
debug "${FUNCNAME[0]}" "$*" debug "${FUNCNAME[0]}" "$*"
local -a url_file_pairs=("$@") local -a url_file_pairs=("$@")
for ((i=0; i<${#url_file_pairs[@]}; i+=2)); do for ((i=0; i<${#url_file_pairs[@]}; i+=2)); do
@@ -782,4 +780,4 @@ main() {
} }
main "$@" main "$@"
exit $? exit