From a9a7b7b471017a1eb970f80552227dcfc5984db1 Mon Sep 17 00:00:00 2001 From: Pekka Helenius Date: Tue, 18 Jan 2022 12:27:42 +0200 Subject: [PATCH] Add options.conf --- options.conf | 28 ++++++++++++++++++++++++++++ updatewine.sh | 26 ++------------------------ 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 options.conf diff --git a/options.conf b/options.conf new file mode 100644 index 0000000..039774b --- /dev/null +++ b/options.conf @@ -0,0 +1,28 @@ +######################################################## + +# Options for DXVK/Wine-Staging scripts dispatcher script + +######################################################## + +# Should we freeze Git versions of these packages? +# This is handy in some cases, if breakages occur +# (although we actually compile an older version of a package) +# +# Define a commit hash to freeze to +# Use keyword 'HEAD' if you want to use the latest git +# version available +# Do NOT leave these variable empty! + +git_commithash_dxvk=HEAD +git_branch_dxvk=master + +git_commithash_wine=HEAD +git_branch_wine=master + +########## +# These apply only on Debian/Ubuntu/Mint +git_commithash_meson=5d6dcf8850fcc5d552f55943b6aa3582754dedf8 +git_branch_meson=master + +git_commithash_glslang=HEAD +git_branch_glslang=master diff --git a/updatewine.sh b/updatewine.sh index a8f856a..bd3360b 100755 --- a/updatewine.sh +++ b/updatewine.sh @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +source options.conf + ############################################################################## # Check if we're using bash or sh to run the script. If bash, OK. @@ -37,30 +39,6 @@ fi SCRIPT_TITLE="\e[1mWine/Wine Staging & DXVK package builder & auto-installer\e[0m" SCRIPT_AUTHOR="Pekka Helenius (~Fincer), 2019" -######################################################## - -# Should we freeze Git versions of these packages? -# This is handy in some cases, if breakages occur -# (although we actually compile an older version of a package) -# -# Define a commit hash to freeze to -# Use keyword 'HEAD' if you want to use the latest git -# version available -# Do NOT leave these variable empty! - -git_commithash_dxvk=HEAD -git_branch_dxvk=master - -git_commithash_wine=HEAD -git_branch_wine=master - -# These apply only on Debian/Ubuntu/Mint -git_commithash_meson=5d6dcf8850fcc5d552f55943b6aa3582754dedf8 -git_branch_meson=master - -git_commithash_glslang=HEAD -git_branch_glslang=master - ########################################################### # Allow interruption of the script at any time (Ctrl + C) trap "exit" INT