CastroFidel/PortWINE
3
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Htylol-hotfix-userconf-1' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev 2025-03-07 20:11:33 +03:00
commit 0caf3d4ad1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data_from_portwine/scripts/functions_helper
View File

@ -2489,8 +2489,11 @@ pw_port_update () {
;; ;;
esac esac
if [[ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ]] ; then if [[ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ]] \
|| [[ ! $BRANCH =~ (devel|master) ]]; then
echo "2024" > "${PORT_WINE_TMP_PATH}/scripts_ver" echo "2024" > "${PORT_WINE_TMP_PATH}/scripts_ver"
BRANCH_VERSION_UPDATE="SCRIPTS_STABLE_VERSION"
BRANCH="master"
fi fi
URL_ETERFUND="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/${BRANCH}/data_from_portwine/scripts/var" URL_ETERFUND="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/${BRANCH}/data_from_portwine/scripts/var"
@ -6121,6 +6124,10 @@ gui_userconf () {
unset SKIP_CHECK_UPDATES unset SKIP_CHECK_UPDATES
export PW_CHANGE_BRANCH="1" export PW_CHANGE_BRANCH="1"
export PW_FORCE_UPDATE="1" export PW_FORCE_UPDATE="1"
else
if [[ $BRANCH == "DEVEL" ]] ; then BRANCH="devel"
elif [[ $BRANCH == "STABLE" ]] ; then BRANCH="master"
fi
fi fi
PW_GUI_START="${PW_ADD_SETTINGS_UC[2]}" PW_GUI_START="${PW_ADD_SETTINGS_UC[2]}"
DOWNLOAD_STEAM_GRID="${PW_ADD_SETTINGS_UC[3]}" DOWNLOAD_STEAM_GRID="${PW_ADD_SETTINGS_UC[3]}"