diff --git a/ublinux/rc.preinit.d/51-autologin b/ublinux/rc.preinit.d/51-autologin index 0ed0128..757e6b9 100755 --- a/ublinux/rc.preinit.d/51-autologin +++ b/ublinux/rc.preinit.d/51-autologin @@ -62,7 +62,7 @@ SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null [[ -f ${ROOTFS}/etc/lxdm/lxdm.conf ]] && sed -i "s/^#autologin=.*/autologin=${AUTOLOGINUSER}/g" ${ROOTFS}/etc/lxdm/lxdm.conf if [[ -f ${FILE_LIGHTDM_CONF} ]]; then sed "/^autologin-user=.*/d" -i ${FILE_LIGHTDM_CONF} - mkdir -p ${{FILE_LIGHTDM_AUTOLOGIN_CONF%/*} + mkdir -p ${FILE_LIGHTDM_AUTOLOGIN_CONF%/*} cat <<-EOF | sed 's/^\s*\t*//' > "${FILE_LIGHTDM_AUTOLOGIN_CONF}" [Seat:*] autologin-user=${AUTOLOGINUSER} diff --git a/ublinux/rc.preinit.d/63-xorg-dpi b/ublinux/rc.preinit.d/63-xorg-dpi index d627aaf..336880e 100755 --- a/ublinux/rc.preinit.d/63-xorg-dpi +++ b/ublinux/rc.preinit.d/63-xorg-dpi @@ -30,7 +30,7 @@ exec_xorg_dpi(){ GDK_DPI_SCALE=0 ELM_SCALE=1 # Масштабирование для UI Elementary QT_FONT_DPI=96 # - #PLASMA_USE_QT_SCALING=0 # Разрешить Plasma использовать настройки QT по масштабированию + PLASMA_USE_QT_SCALING=0 # Разрешить Plasma использовать настройки QT по масштабированию #QT_AUTO_SCREEN_SCALE_FACTOR=0 # Автоматическое масштабирование, отключать при масштабировании вручную #QT_SCALE_FACTOR=2 # Масштабирование вручную, глобально для всех экранов #QT_SCREEN_SCALE_FACTORS="2;2;2;2" # Масштабирование вручную для каждого экрана @@ -39,7 +39,7 @@ exec_xorg_dpi(){ grep -q "^\s*GDK_DPI_SCALE=" ${ROOTFS}/etc/environment 2>/dev/null && grep -v "^\s*GDK_DPI_SCALE=" ${ROOTFS}/etc/environment > ${ROOTFS}/etc/environment grep -q "^\s*ELM_SCALE=" ${ROOTFS}/etc/environment 2>/dev/null && grep -v "^\s*ELM_SCALE=" ${ROOTFS}/etc/environment > ${ROOTFS}/etc/environment grep -q "^\s*QT_FONT_DPI=" ${ROOTFS}/etc/environment 2>/dev/null && grep -v "^\s*QT_FONT_DPI=" ${ROOTFS}/etc/environment > ${ROOTFS}/etc/environment - #grep -q "^\s*PLASMA_USE_QT_SCALING=" ${ROOTFS}/etc/environment 2>/dev/null && grep -v "^\s*PLASMA_USE_QT_SCALING=" ${ROOTFS}/etc/environment > ${ROOTFS}/etc/environment + grep -q "^\s*PLASMA_USE_QT_SCALING=" ${ROOTFS}/etc/environment 2>/dev/null && grep -v "^\s*PLASMA_USE_QT_SCALING=" ${ROOTFS}/etc/environment > ${ROOTFS}/etc/environment #grep -q "^\s*QT_AUTO_SCREEN_SCALE_FACTOR=" ${ROOTFS}/etc/environment 2>/dev/null && grep -v "^\s*QT_AUTO_SCREEN_SCALE_FACTOR=" ${ROOTFS}/etc/environment > ${ROOTFS}/etc/environment return 0 elif [[ ${XORG_DPI} == auto ]]; then @@ -53,7 +53,7 @@ exec_xorg_dpi(){ ELM_SCALE=1.5 LIGHTDM_CURSOR_MOUSE=48 QT_FONT_DPI=192 - #PLASMA_USE_QT_SCALING=1 + PLASMA_USE_QT_SCALING=1 #QT_AUTO_SCREEN_SCALE_FACTOR=1 elif [[ ${XORG_DPI} == @(144|2K) ]]; then XORG_DPI=144 @@ -62,7 +62,7 @@ exec_xorg_dpi(){ ELM_SCALE=1.5 LIGHTDM_CURSOR_MOUSE=32 QT_FONT_DPI=144 - #PLASMA_USE_QT_SCALING=1 + PLASMA_USE_QT_SCALING=1 #QT_AUTO_SCREEN_SCALE_FACTOR=1 fi grep -q "^\s*GDK_SCALE=" ${ROOTFS}/etc/environment 2>/dev/null \ @@ -77,9 +77,9 @@ exec_xorg_dpi(){ grep -q "^\s*QT_FONT_DPI=" ${ROOTFS}/etc/environment 2>/dev/null \ && sed -E "s/^\s*(QT_FONT_DPI=).*/\1${QT_FONT_DPI}/" -i ${ROOTFS}/etc/environment 2>/dev/null \ || sed -e '$a\' -e "QT_FONT_DPI=${QT_FONT_DPI}" -i ${ROOTFS}/etc/environment 2>/dev/null - #grep -q "^\s*PLASMA_USE_QT_SCALING=" ${ROOTFS}/etc/environment 2>/dev/null \ - # && sed -E "s/^\s*(PLASMA_USE_QT_SCALING=).*/\1${PLASMA_USE_QT_SCALING}/" -i ${ROOTFS}/etc/environment 2>/dev/null \ - # || sed -e '$a\' -e "PLASMA_USE_QT_SCALING=${PLASMA_USE_QT_SCALING}" -i ${ROOTFS}/etc/environment 2>/dev/null + grep -q "^\s*PLASMA_USE_QT_SCALING=" ${ROOTFS}/etc/environment 2>/dev/null \ + && sed -E "s/^\s*(PLASMA_USE_QT_SCALING=).*/\1${PLASMA_USE_QT_SCALING}/" -i ${ROOTFS}/etc/environment 2>/dev/null \ + || sed -e '$a\' -e "PLASMA_USE_QT_SCALING=${PLASMA_USE_QT_SCALING}" -i ${ROOTFS}/etc/environment 2>/dev/null #grep -q "^\s*QT_AUTO_SCREEN_SCALE_FACTOR=" ${ROOTFS}/etc/environment 2>/dev/null \ # && sed -E "s/^\s*(QT_AUTO_SCREEN_SCALE_FACTOR=).*/\1${QT_AUTO_SCREEN_SCALE_FACTOR}/" -i ${ROOTFS}/etc/environment 2>/dev/null \ # || sed -e '$a\' -e "QT_AUTO_SCREEN_SCALE_FACTOR=${QT_AUTO_SCREEN_SCALE_FACTOR}" -i ${ROOTFS}/etc/environment 2>/dev/null