From 88207560a70bddddfc57f3ae27e0f143b6a73b64 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 9 Nov 2023 22:45:11 +0100 Subject: [PATCH] shellcheck fixes --- .ci/ci-package.sh | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.ci/ci-package.sh b/.ci/ci-package.sh index 9e8b8300..4b4c4908 100755 --- a/.ci/ci-package.sh +++ b/.ci/ci-package.sh @@ -1,58 +1,58 @@ -#!/bin/bash +#! /bin/sh PACKAGE_VERSION="$1" cd dnscrypt-proxy || exit 1 - # setup the environment -####################### + sudo apt-get update -y sudo apt-get install -y wget wine dotnet-sdk-6.0 sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install -y wine32 -sudo apt-get install -y unzip +sudo apt-get install -y unzip -export WINEPREFIX=$HOME/.wine32 +export WINEPREFIX="$HOME"/.wine32 export WINEARCH=win32 export WINEDEBUG=-all -wget https://dl.winehq.org/wine/wine-mono/8.1.0/wine-mono-8.1.0-x86.msi -WINEPREFIX="$HOME/.wine32" WINEARCH=win32 wineboot --init -WINEPREFIX="$HOME/.wine32" WINEARCH=win32 wine msiexec /i wine-mono-8.1.0-x86.msi +wget https://dl.winehq.org/wine/wine-mono/8.1.0/wine-mono-8.1.0-x86.msi +WINEPREFIX="$HOME/.wine32" WINEARCH=win32 wineboot --init +WINEPREFIX="$HOME/.wine32" WINEARCH=win32 wine msiexec /i wine-mono-8.1.0-x86.msi -mkdir $HOME/.wine32/drive_c/temp -mkdir -p $HOME/.wine/drive_c/temp -wget https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip -nv -O wix.zip +mkdir "$HOME"/.wine32/drive_c/temp +mkdir -p "$HOME"/.wine/drive_c/temp +wget https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip -nv -O wix.zip -unzip wix.zip -d $HOME/wix +unzip wix.zip -d "$HOME"/wix rm -f wix.zip builddir=$(pwd) -srcdir=$(cd ..;pwd) +srcdir=$( + cd .. + pwd +) version=$PACKAGE_VERSION -cd $HOME/wix +cd "$HOME"/wix || exit - -ln -s $builddir $HOME/wix/build -ln -s $srcdir/contrib/msi $HOME/wix/wixproj +ln -s "$builddir" "$HOME"/wix/build +ln -s "$srcdir"/contrib/msi "$HOME"/wix/wixproj echo "builddir: $builddir" # build the msi's ################# -for arch in x64 x86 -do +for arch in x64 x86; do binpath="win32" - if [[ "$arch" == "x64" ]]; then + if [ "$arch" = "x64" ]; then binpath="win64" fi echo $arch - wine candle.exe -dVersion=$version -dPlatform=$arch -dPath=build\\$binpath -arch $arch wixproj\\dnscrypt.wxs -out build\\dnscrypt-$arch.wixobj - wine light.exe -out build\\dnscrypt-proxy-$arch-$version.msi build\\dnscrypt-$arch.wixobj -sval + wine candle.exe -dVersion="$version" -dPlatform=$arch -dPath=build\\$binpath -arch $arch wixproj\\dnscrypt.wxs -out build\\dnscrypt-$arch.wixobj + wine light.exe -out build\\dnscrypt-proxy-$arch-"$version".msi build\\dnscrypt-$arch.wixobj -sval done -cd $builddir +cd "$builddir" || exit