From nobody Wed Jan 31 12:28:40 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ1Y42QFvz58Qk1; Wed, 31 Jan 2024 12:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQ1Y41vdjz4Yy5; Wed, 31 Jan 2024 12:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706704120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1X9Szztjg00HoFK6w08gHfuiEb+ZuH8DKlUpnnQn8g=; b=lZKqdUq1GkFi3Q41Y9pBhoQyR+Vb/C7ff4ABdYxDdklVmGT63R8hqD46WGDh+UNp86y/BM svgbljiY9U8lU7nKWtnStR5ss5HdC1geGraVAqKKMJLvgk8f3oxQRiez5eP1X6wxpKywWO LKokfxVAupwmYpisNBFEkUCYt4YJ6kmr9y8y2VowQr3akDdmU9o3jmOM1szwpLIYG6F+Jm tTzDFWywmBBNJFg47gmH1gIFiuTTXBx7iwi4OjO8K0VX7TD4Y2WeCoPpWgHf9vRIe1kkoA vHhtaNCubHI8V1Ky6K46q/H5wo+GtnxKJyOJEEB7fb7HKbP99aczbDnwRfBuaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706704120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H1X9Szztjg00HoFK6w08gHfuiEb+ZuH8DKlUpnnQn8g=; b=qot/EQoVjhHIMvTmfLE2TCnJXVmvEVCM5/5TEn25z9ssZBEepk0HDxKm7fRj5xm0YJmATK IY8EP0KYIuZKkRBtw+w5RwyUpCLH91mMLOh5yLi4IK8zGV0G28qHA5cN/GAS7Mz4HhHA6+ uT0GluG8gDqvIQ8L2xAlqgpDElbfVOWT60ITJ4fz2ahzpE5TR+IIbeKpHIRGW32qAg2rzW R5Nqmgvq85LHL+iL1UuYS1kbZv8xaKX+1qu3MJKTZLaFKMY8PzGelodECpBLebCScwl5Og YLaM1pXioZpwuf5J2tUK7qm4P6OKamINpB3pL0u5tMh32MoZexAA7Tda2yQqbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706704120; a=rsa-sha256; cv=none; b=xZJYPf+hvBjvT2lPqQ+Vxv8qqAN1QnoBx9wab43Z9e3q2AFjduO3ZzzSjZJBmT+VQdLx66 vGJWzP0EnH1gz5hqXqaWxEGcIQM6YdMAgHWoHrRG2a9RLBDl/TI/8rDR9tV+55onkBI5gW xmuehkoI3eUFMRArVP+wRlIk8pf9ZoX6iGyWJHtZHjmFyWUIO3LHLH70zubUN3/iBv1A1Q TMbnb9CIt+HSNAKQeFpnAOAIp2qVdGRcgbHzhv4EP1Hj7uWraic/4AygjIkMZDU8oUJhJT 2ca9fU32Gt+qYjRT8my4b86XlfqbLEWuKMqb93FBaW/uZIqJeNnXw6WscyV8ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQ1Y40xzGzJ8r; Wed, 31 Jan 2024 12:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40VCSeVG040654; Wed, 31 Jan 2024 12:28:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VCSePo040651; Wed, 31 Jan 2024 12:28:40 GMT (envelope-from git) Date: Wed, 31 Jan 2024 12:28:40 GMT Message-Id: <202401311228.40VCSePo040651@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: ef11261971a8 - main - emulators/wine: Simplify the logic in wine.sh List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef11261971a87d2b75b352ab479b651d2f2b0b50 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef11261971a87d2b75b352ab479b651d2f2b0b50 commit ef11261971a87d2b75b352ab479b651d2f2b0b50 Author: Gerald Pfeifer AuthorDate: 2024-01-31 12:27:21 +0000 Commit: Gerald Pfeifer CommitDate: 2024-01-31 12:27:21 +0000 emulators/wine: Simplify the logic in wine.sh PR: 275677 Discussed with: Alex S --- emulators/wine/files/wine.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/emulators/wine/files/wine.sh b/emulators/wine/files/wine.sh index 057406196371..ebd89e55ebdc 100644 --- a/emulators/wine/files/wine.sh +++ b/emulators/wine/files/wine.sh @@ -2,15 +2,11 @@ TARGET="$(realpath "$0")" -if [ -z "$WINESERVER" ] -then - if [ -f "${TARGET%/*}/wineserver" ] - then - export WINESERVER="${TARGET%/*}/wineserver" - fi - if [ -f "${TARGET%/*}/wineserver32" ] - then +if [ -z "$WINESERVER" ]; then + if [ -f "${TARGET%/*}/wineserver32" ]; then export WINESERVER="${TARGET%/*}/wineserver32" + elif [ -f "${TARGET%/*}/wineserver" ]; then + export WINESERVER="${TARGET%/*}/wineserver" fi fi