diff --git a/make/projects-dir.mk b/make/projects-dir.mk index a551e429..eaf006e9 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -127,10 +127,10 @@ pkg-manager-refresh: $(PKG_MANAGER_SH) refresh -y pkg-install-prereq-build: - @$(PROJECTS_PY) requires-pkg --flavours "build" $(BUILD_PROJECTS) | xargs -r $(PKG_MANAGER_SH) install -y + $(PKG_MANAGER_SH) install -y $(shell $(PROJECTS_PY) requires-pkg --flavours "build" $(BUILD_PROJECTS)) pkg-install-prereq-release: - @$(PROJECTS_PY) requires-pkg --flavours "build run release" $(BUILD_PROJECTS) | xargs -r $(PKG_MANAGER_SH) install -y + $(PKG_MANAGER_SH) install -y $(shell $(PROJECTS_PY) requires-pkg --flavours "build run release" $(BUILD_PROJECTS)) pkg-exclude-built-today: touch $(EXCLUDES_FILE) diff --git a/scripts/pkg-manager.sh b/scripts/pkg-manager.sh index 57b0b5d2..d42e089e 100644 --- a/scripts/pkg-manager.sh +++ b/scripts/pkg-manager.sh @@ -51,14 +51,14 @@ cmd_install() opts="--force-resolution --auto-agree-with-licenses" global_opts="$global_opts --non-interactive --gpg-auto-import-keys --no-gpg-checks" } - eval run sudo $env zypper $global_opts install $opts "$@" + eval run sudo $env -S zypper $global_opts install $opts "$@" ;; debian) [ "$non_interactive" = 1 ] && { global_opts="$global_opts -yq" env="$env DEBIAN_FRONTEND=noninteractive" } - eval run sudo $env apt-get $global_opts install "$@" + eval run sudo $env -S apt-get $global_opts install "$@" ;; *) fatal "Tried to install on unsupported platform \"$ID\"" @@ -87,10 +87,10 @@ cmd_refresh() [ "$non_interactive" = 1 ] && { global_opts="$global_opts --non-interactive --gpg-auto-import-keys --no-gpg-checks" } - eval run sudo $env zypper $global_opts refresh $opts "$@" + eval run sudo $env -S zypper $global_opts refresh $opts "$@" ;; debian) - eval run sudo $env apt-get $global_opts update "$@" + eval run sudo $env -S apt-get $global_opts update "$@" ;; *) fatal "Tried to update unsupported platform \"$ID\""