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

Merge branch 'Htylol-fixes-name_block' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev 2024-11-14 16:19:42 +03:00
commit 6394a9deac
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data_from_portwine/scripts/functions_helper
View File

@ -1337,26 +1337,23 @@ get_and_set_reg_file () {
case $name_type_reg in case $name_type_reg in
REG_DWORD) REG_DWORD)
name_for_find='"'"$name_for_find"'"'"=dword:" name_for_find="\"$name_for_find\"=dword:"
name_for_set=$(convert_dec_and_hex --dec "$name_for_set") ;; name_for_set=$(convert_dec_and_hex --dec "$name_for_set") ;;
REG_SZ) REG_SZ)
name_for_find='"'"$name_for_find"'"'"=" name_for_find="\"$name_for_find\"="
name_for_set='"'"$name_for_set"'"' ;; name_for_set="\"$name_for_set\"" ;;
*) *)
if [[ $name_add_or_del == --delete ]] ; then if [[ $name_add_or_del == --delete ]] ; then
name_for_find='"'"$name_for_find"'"' name_for_find="\"$name_for_find\""
else else
print_error "Name type reg not set for $name_fatal" print_error "Name type reg not set for $name_fatal"
return 1 return 1
fi ;; fi ;;
esac esac
name_block=${name_block//\\/\\\\\\\\\\\\\\}
name_block=${name_block//*/\\[$name_block}
name_block="${name_block//*/${name_block//\\/\\\\}\\]}"
if [[ -n $name_for_new_block ]] ; then if [[ -n $name_for_new_block ]] ; then
find_block=$(grep -n "$name_block" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg") find_block=$(grep -n "${name_block//\\/\\\\\\\\}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg")
else else
find_block=$(grep -n "$name_block" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/"*.reg) find_block=$(grep -n "${name_block//\\/\\\\\\\\}" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/"*.reg)
fi fi
if [[ -n $find_block ]] ; then if [[ -n $find_block ]] ; then
if [[ -n $name_for_new_block ]] ; then if [[ -n $name_for_new_block ]] ; then
@ -1385,7 +1382,7 @@ get_and_set_reg_file () {
if [[ $name_add_or_del == --add ]] ; then if [[ $name_add_or_del == --add ]] ; then
if [[ -z $find_block ]] ; then if [[ -z $find_block ]] ; then
if [[ -n $name_for_new_block ]] ; then if [[ -n $name_for_new_block ]] ; then
sed -i '$a\\n'"$name_block" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg" sed -i '$a\\n'\["${name_block//\\/\\\\\\\\}"\] "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg"
find_file="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg" find_file="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/$name_for_new_block.reg"
find_line=$(wc -l "$find_file" | awk -F" " '{print $1}') find_line=$(wc -l "$find_file" | awk -F" " '{print $1}')
find_line=$(( find_line - 1 )) find_line=$(( find_line - 1 ))
@ -3318,7 +3315,7 @@ start_portwine () {
if command -v systemd-inhibit &>/dev/null \ if command -v systemd-inhibit &>/dev/null \
&& [[ "$GAMEMODERUN" != "1" ]] && [[ "$GAMEMODERUN" != "1" ]]
then then
PW_INHIBIT_SLR="eval systemd-inhibit --mode=block --who=ru.linux_gaming.PortProton --why=\"${translations[Launched]} $PW_NAME_DESKTOP_PROXY\"" PW_INHIBIT_SLR="systemd-inhibit --mode=block --who=ru.linux_gaming.PortProton --why=${translations[Launched]}"
print_info "Screensaver will be inhibit" print_info "Screensaver will be inhibit"
fi fi
pw_other_fixes pw_other_fixes