Skip to content

Commit

Permalink
build_multilib_wine: fix Wine (Staging) branches, update versions
Browse files Browse the repository at this point in the history
 * main(): fix calls to: dpkg_query_wrapper()
 * setup_chroot_build_env(): fix main comment
 * update script release: 20200710
  • Loading branch information
bobwya committed Jul 10, 2020
1 parent 1f5760c commit bba8718
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/build_multilib_wine
Original file line number Diff line number Diff line change
Expand Up @@ -2255,8 +2255,8 @@ EOF_Schroot_wine
# Description:
# This function initally ensures that the chroot environment has a valid
# locale set - using either: the Host System locale or fall-back of 'en_US.UTF-8'.
# We then install a minimal repository list, using our previously generated
# 'sources.list' file, within the chroot environment.
# We then setup a minimal repository sources.list, using our previously determined
# Debian / Ubuntu mirror URI (REPOSITORY_MIRROR_URI), within the chroot environment.
# A base-minimal package is chosen, depending on the Linux Distribution
# (Debian / Ubuntu).
# We then start Schroot, as root. Next we run the Schroot, installing a base set
Expand Down Expand Up @@ -3264,22 +3264,22 @@ function execute_commands()
# WINE_STAGING=${wine_staging_enabled} # default
#
# Wine version to build.
# WINE_VERSION="4.11"
# WINE_VERSION="5.12"
#
# Git branch of Wine to build (WINE_STAGING=no).
# WINE_BRANCH="refs/heads/master"
# WINE_BRANCH="origin/master"
#
# Git commit (SHA-1 hash) of Wine to build (WINE_STAGING=no).
# WINE_COMMIT=""
#
# Git branch of Wine-Staging to build (WINE_STAGING=yes).
# WINE_STAGING_BRANCH="refs/heads/master"
# WINE_STAGING_BRANCH="origin/master"
#
# Git commit (SHA-1 hash) of Wine-Staging to build (WINE_STAGING=yes).
# WINE_STAGING_COMMIT=""
#
# Wine-Staging version to build.
# WINE_STAGING_VERSION="4.11"
# WINE_STAGING_VERSION="5.12"
#
# Logging
#
Expand Down Expand Up @@ -3463,7 +3463,7 @@ function main()
{
export BUILD_MULTILIB_WINE_VERSION SCRIPT_DIRECTORY SCRIPT_NAME SCRIPT_PID SCRIPT_PATH

BUILD_MULTILIB_WINE_VERSION="20190605"
BUILD_MULTILIB_WINE_VERSION="20200710"
SCRIPT_PID=$$
SCRIPT_PATH="$(readlink -f "${0}")"
SCRIPT_DIRECTORY="$(dirname "${SCRIPT_PATH}")"
Expand Down Expand Up @@ -3624,9 +3624,9 @@ function main()
# shellcheck disable=SC2153
if [[ -n "${LOG_COMPRESSION}" ]]; then
set_log_compression "${LOG_COMPRESSION}"
elif dpkg_query_wrapper xz &>/dev/null; then
elif dpkg_query_wrapper 'xz-utils' &>/dev/null; then
set_log_compression "xz"
elif dpkg_query_wrapper gzip &>/dev/null; then
elif dpkg_query_wrapper 'gzip' &>/dev/null; then
set_log_compression "gzip"
else
set_log_compression "none"
Expand Down

0 comments on commit bba8718

Please sign in to comment.