From c0cfb0ce19dbe547f20a58ebbad57c0758023c19 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 15 Jul 2024 10:45:08 +0300 Subject: [PATCH] drop - from stable version --- data_from_portwine/scripts/functions_helper | 2 +- data_from_portwine/scripts/start.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 0d1de12..b0c2ce5 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1410,7 +1410,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_install_ver}-${BRANCH_VERSION})" --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 \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 570f017..808e272 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -181,7 +181,7 @@ if [[ "$BRANCH" == "master" ]] ; then export BRANCH_VERSION="" else print_warning "Branch in used: DEVEL\n" - export BRANCH_VERSION="dev" + export BRANCH_VERSION="-dev" fi # choose mirror @@ -512,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}-${BRANCH_VERSION})" --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"!"" \ @@ -552,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}-${BRANCH_VERSION})" \ + --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 \ @@ -707,7 +707,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}-${BRANCH_VERSION})" \ + --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"!"" \ @@ -720,7 +720,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}-${BRANCH_VERSION})" \ + --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"!"" \