diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog index 0e6bf485..9eb0f2d6 100755 --- a/data_from_portwine/changelog +++ b/data_from_portwine/changelog @@ -6,8 +6,12 @@ * добавить комментарии описывающие функционал скриптов и db файлов * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2016### +* убрано удаление иконок внутри каталогов с играми после создания ярлыков +* HOTFIX - исправлено создание ссылок для MONO и GECKO при первом запуске порта + ###Scripts version 2015### -* расширty функционал проверки существования mono и gecko +* расширен функционал проверки существования mono и gecko * добавлена новая функция check_symlink * временно возвращено использование libs_v17 * в EDIT_DB добавлена возможность отключения winegstreamer diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index ca7da297..89c462f8 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -472,7 +472,7 @@ pw_tray_icon () { if [ ! -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ] then kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" fi - killall start.sh + kill -9 `pgrep -a start.sh | awk '/PortWINE/ && /PortProton/' | awk '{print $1}'` } export -f tray_icon_click_exit diff --git a/data_from_portwine/scripts/portwine_db/default b/data_from_portwine/scripts/portwine_db/default index 5fd6d8b7..c4688799 100755 --- a/data_from_portwine/scripts/portwine_db/default +++ b/data_from_portwine/scripts/portwine_db/default @@ -41,4 +41,6 @@ ##export PW_USE_TERMINAL=1 # Force run in terminal ##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##export PATH_TO_GAME= + ##add_in_start_portwine () { commands ; } \ No newline at end of file diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index bc775f4e..a050a44a 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -19,6 +19,7 @@ fi start_portwine () { pw_check_and_download_wine "${PW_WINE_USE}" + init_wine_ver pw_tray_icon & if [ -x "`which konsole 2>/dev/null`" ]; then export PW_TERM="konsole --nofork -e" # elif [ -x "`which gnome-terminal 2>/dev/null`" ]; then export PW_TERM="gnome-terminal -- /bin/bash" ??? @@ -397,7 +398,9 @@ start_portwine () { pw_run () { if [ ! -z "$portwine_exe" ] ; then - export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" + if [ -z "$PATH_TO_GAME" ] ; then + export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" + fi cd "${PATH_TO_GAME}" else cd "${WINEPREFIX}/drive_c" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 1fbffc04..e5c86ab0 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -5,7 +5,7 @@ if [ -f "$1" ]; then export portwine_exe="$(readlink -f "$1")" fi . "$(dirname $(readlink -f "$0"))/runlib" -kill_portwine +kill_portwine portwine_launch () { start_portwine @@ -43,8 +43,6 @@ portwine_create_shortcut () { icotool -x --output="${PORTPROTON_PATH}/" "${PORTPROTON_EXE}.ico" cp "$(ls -S -1 "${PORTPROTON_EXE}"*".png" | head -n 1)" "${PORTPROTON_EXE}.png" cp -f "${PORTPROTON_EXE}.png" "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" - rm -f "${PORTPROTON_PATH}/"*.ico - rm -f "${PORTPROTON_PATH}/"*.png fi name_desktop="${PORTPROTON_NAME}" echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 23a432a8..46e5053a 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2015 +#SCRIPTS_NEXT_VERSION=2016 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1