Htylol/PortWINE
1
0
Fork 0
forked from CastroFidel/PortWINE
Code Pull Requests Activity

Added information about branch version in title

Browse Source
This commit is contained in:
Htylol
2024-07-14 18:48:44 +05:00
parent aa42c8ae4e
commit d7c1ac8dd8
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data_from_portwine/scripts/functions_helper
View File

@@ -1357,11 +1357,11 @@ pw_init_db () {
pw_port_update () {
case "$BRANCH" in
master|stable)
BRANCH_VERSION="SCRIPTS_STABLE_VERSION"
BRANCH_VERSION_UPDATE="SCRIPTS_STABLE_VERSION"
BRANCH="master"
;;
devel|beta)
BRANCH_VERSION="SCRIPTS_NEXT_VERSION"
BRANCH_VERSION_UPDATE="SCRIPTS_NEXT_VERSION"
BRANCH="devel"
;;
esac
@@ -1389,7 +1389,7 @@ pw_port_update () {
[[ ! -f "${PORT_WINE_TMP_PATH}/scripts_update_notifier" ]] && echo "1" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
read "scripts_update_not" < "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
if [[ "${scripts_update_not}" == "1" ]] ; then
scripts_current_ver=$(grep "$BRANCH_VERSION" "${PORT_WINE_TMP_PATH}/curent_var_ver" | awk -F "=" '{print $2}')
scripts_current_ver=$(grep "$BRANCH_VERSION_UPDATE" "${PORT_WINE_TMP_PATH}/curent_var_ver" | awk -F "=" '{print $2}')
print_info "Scripts version in git = ${scripts_current_ver}"
print_info "Scripts version local = ${scripts_install_ver}"
if [[ ! -z "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then
@@ -1406,7 +1406,7 @@ pw_port_update () {
else
curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" | tee "${PORT_WINE_TMP_PATH}/curent_var_ver"
CHANGLOG_NEWS=$(sed "/Scripts version ${scripts_install_ver}/,$ d" "${PORT_WINE_TMP_PATH}/curent_var_ver" | sed '1,/---/ d' )
xcsd=$("${pw_yad}" --title "$(gettext "Update scripts:") v.${scripts_current_ver}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
xcsd=$("${pw_yad}" --title "$(gettext "Update scripts:") v.(${scripts_install_ver}-${BRANCH_VERSION})" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--form --separator='%%%' --width=1200 --height=600 \
--field=":TXT" "${CHANGLOG_NEWS}" \
--button="$(gettext "EXIT")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \

17
data_from_portwine/scripts/start.sh
View File

@@ -176,9 +176,12 @@ if [[ -z "$BRANCH" ]] ; then
echo 'export BRANCH="master"' >> "$USER_CONF"
export BRANCH="master"
fi
if [[ "$BRANCH" == "master" ]]
then print_info "Branch in used: STABLE\n"
else print_warning "Branch in used: DEVEL\n"
if [[ "$BRANCH" == "master" ]] ; then
print_info "Branch in used: STABLE\n"
export BRANCH_VERSION="$(gettext 'stable')"
else
print_warning "Branch in used: DEVEL\n"
export BRANCH_VERSION="devel"
fi
# choose mirror
@@ -509,7 +512,7 @@ if [[ -f "${portwine_exe}" ]] ; then
"${pw_yad}" --key=$KEY_START --notebook --active-tab=${TAB_START} \
--gui-type=settings-notebook \
--width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" --center \
--title "PortProton-${install_ver} (${scripts_install_ver})" --expand \
--title "PortProton-${install_ver} (${scripts_install_ver}-${BRANCH_VERSION})" --expand \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--tab="$(gettext "GENERAL")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
--tab="$(gettext "SETTINGS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
@@ -549,7 +552,7 @@ if [[ -f "${portwine_exe}" ]] ; then
"${pw_yad}" --key=$KEY_START --paned --center \
--gui-type=settings-paned \
--width="${PW_START_SIZE_W}" --tab-pos="${PW_TAB_POSITON}" \
--title "PortProton-${install_ver} (${scripts_install_ver})" \
--title "PortProton-${install_ver} (${scripts_install_ver}-${BRANCH_VERSION})" \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--button="${PW_SHORTCUT}" \
--button="$(gettext "DEBUG")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Launch with the creation of a .log file at the root PortProton")":102 \
@@ -703,7 +706,7 @@ else
--gui-type=settings-notebook \
--width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \
--auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--title "PortProton-${install_ver} (${scripts_install_ver})" \
--title "PortProton-${install_ver} (${scripts_install_ver}-${BRANCH_VERSION})" \
--tab-pos=bottom \
--tab="$(gettext "AUTOINSTALLS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
--tab="$(gettext "EMULATORS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
@@ -716,7 +719,7 @@ else
--gui-type=settings-notebook \
--width="${PW_MAIN_SIZE_W}" --height="${PW_MAIN_SIZE_H}" --no-buttons \
--auto-close --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--title "PortProton-${install_ver} (${scripts_install_ver})" \
--title "PortProton-${install_ver} (${scripts_install_ver}-${BRANCH_VERSION})" \
--tab-pos=bottom \
--tab="$(gettext "INSTALLED")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \
--tab="$(gettext "AUTOINSTALLS")"!"$PW_GUI_ICON_PATH/$TAB_SIZE.png"!"" \