[neon/neon/settings/Neon/release_jammy] etc: Revert "add various ally and startups scripts borrowed from fedora"
Carlos De Maine
null at kde.org
Wed Aug 21 09:54:05 BST 2024
Git commit 5fcfee19121177eb989ada9078899bd1a2e797f7 by Carlos De Maine.
Committed on 21/08/2024 at 08:54.
Pushed by carlosdem into branch 'Neon/release_jammy'.
Revert "add various ally and startups scripts borrowed from fedora"
This reverts commit 82f342a75b79a079a085cedc2f31305277823ff6
D +0 -21 etc/kde/env/env.sh
D +0 -38 etc/kde/env/gpg-agent-startup.sh
D +0 -21 etc/kde/env/gtk2_rc_files.sh
D +0 -2 etc/profile.d/kde-openssh-askpass.sh
D +0 -10 etc/profile.d/kde.sh
D +0 -6 etc/xdg/plasma-workspace/env/at-spi-xwayland.sh
D +0 -21 etc/xdg/plasma-workspace/env/gtk2_rc_files.sh
D +0 -7 etc/xdg/plasma-workspace/env/gtk_scrolling.sh
D +0 -4 etc/xdg/plasma-workspace/env/ssh-agent.sh
https://invent.kde.org/neon/neon/settings/-/commit/5fcfee19121177eb989ada9078899bd1a2e797f7
diff --git a/etc/kde/env/env.sh b/etc/kde/env/env.sh
deleted file mode 100644
index e2af9c9..0000000
--- a/etc/kde/env/env.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-## from http://standards.freedesktop.org/menu-spec/latest/
-
-# XDG_CONFIG_DIRS
-if [ -z "${XDG_CONFIG_DIRS}" ] ; then
- #XDG_CONFIG_DIRS=/etc/xdg:/usr/share/kde-settings/kde-profile/default/xdg
- XDG_CONFIG_DIRS=/etc/xdg
- export XDG_CONFIG_DIRS
-fi
-
-# XDG_DATA_DIRS
-if [ -z "${XDG_DATA_DIRS}" ] ; then
- #XDG_DATA_DIRS=/usr/share/kde-settings/kde-profile/default/share:/usr/local/share:/usr/share
- XDG_DATA_DIRS=/usr/local/share:/usr/share
- export XDG_DATA_DIRS
-fi
-
-# XDG_MENU_PREFIX
-if [ -z "${XDG_MENU_PREFIX}" ] ; then
- XDG_MENU_PREFIX="kf5-"
- export XDG_MENU_PREFIX
-fi
\ No newline at end of file
diff --git a/etc/kde/env/gpg-agent-startup.sh b/etc/kde/env/gpg-agent-startup.sh
deleted file mode 100644
index fbeebd2..0000000
--- a/etc/kde/env/gpg-agent-startup.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-GPG_AGENT=/usr/bin/gpg-agent
-## Run gpg-agent only if not already running, and available
-if [ -x "${GPG_AGENT}" ] ; then
-
- # gpg-agent uses ~/.gpg-agent-info by default, but we'll try to use
- # XDG_RUNTIME_DIR too for added safety
- GPG_AGENT_INFO_FILE=${XDG_RUNTIME_DIR:-${HOME}}/.gpg-agent-info
-
- # check validity of GPG_SOCKET (in case of session crash)
- if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
- GPG_AGENT_PID=`cat ${GPG_AGENT_INFO_FILE} | cut -f2 -d:`
- GPG_PID_NAME=`ps -p ${GPG_AGENT_PID} -o comm=`
- if [ ! "x${GPG_PID_NAME}" = "xgpg-agent" ]; then
- rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
- else
- GPG_SOCKET=`cat "${GPG_AGENT_INFO_FILE}" | cut -f1 -d: | cut -f2 -d=`
- if ! test -S "${GPG_SOCKET}" -a -O "${GPG_SOCKET}" ; then
- rm -f "${GPG_AGENT_INFO_FILE}" 2>&1 >/dev/null
- fi
- fi
- unset GPG_AGENT_PID GPG_SOCKET GPG_PID_NAME
- fi
-
- if [ -f "${GPG_AGENT_INFO_FILE}" ]; then
- eval "$(cat "${GPG_AGENT_INFO_FILE}")"
- eval "$(cut -d= -f1 < "${GPG_AGENT_INFO_FILE}" | xargs echo export)"
- export GPG_TTY=$(tty)
- else
- eval "$(${GPG_AGENT} -s --daemon --write-env-file ${GPG_AGENT_INFO_FILE})"
- fi
-
- unset GPG_AGENT_INFO_FILE
-
-fi
-
-unset GPG_AGENT
diff --git a/etc/kde/env/gtk2_rc_files.sh b/etc/kde/env/gtk2_rc_files.sh
deleted file mode 100644
index 18d9746..0000000
--- a/etc/kde/env/gtk2_rc_files.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-GTK2RC_FILE=/usr/share/themes/Adwaita/gtk-2.0/gtkrc
-GTK2RC_KDE4=/usr/share/kde-settings/kde-profile/default/gtkrc-2.0-kde4
-GTK2RC_KDE4_HOME=${HOME}/.gtkrc-2.0-kde4
-
-if [ -f "${GTK2RC_FILE}" -a -f "${GTK2RC_KDE4}" -a ! -f "${GTK2RC_KDE4_HOME}" ]; then
- install -m644 -p "${GTK2RC_KDE4}" "${GTK2RC_KDE4_HOME}"
-fi
-
-if [ -f "${GTK2RC_KDE4_HOME}" ];then
- if [ -z "${GTK2_RC_FILES}" ]; then
- GTK2_RC_FILES=${GTK2RC_KDE4_HOME}
- elif ! echo ${GTK2_RC_FILES} | /bin/grep -q ${GTK2RC_KDE4_HOME} ; then
- GTK2_RC_FILES=${GTK2_RC_FILES}:${GTK2RC_KDE4_HOME}
- fi
- export GTK2_RC_FILES
-fi
-
-unset GTK2RC_FILE GTK2RC_KDE4 GTK2RC_KDE4_HOME
-
diff --git a/etc/profile.d/kde-openssh-askpass.sh b/etc/profile.d/kde-openssh-askpass.sh
deleted file mode 100644
index 37c1531..0000000
--- a/etc/profile.d/kde-openssh-askpass.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-SSH_ASKPASS=/usr/bin/ksshaskpass
-export SSH_ASKPASS
diff --git a/etc/profile.d/kde.sh b/etc/profile.d/kde.sh
deleted file mode 100644
index 71c693e..0000000
--- a/etc/profile.d/kde.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-## Make sure KDEDIRS is set
-[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
-
-## When/if using prelinking, avoids (some) use of kdeinit
-if [ -z "$KDE_IS_PRELINKED" ] ; then
- grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
- KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
-fi
-
diff --git a/etc/xdg/plasma-workspace/env/at-spi-xwayland.sh b/etc/xdg/plasma-workspace/env/at-spi-xwayland.sh
deleted file mode 100644
index 7926258..0000000
--- a/etc/xdg/plasma-workspace/env/at-spi-xwayland.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Set the properties if and only if wayland with xwayland is present
-if [ -n "$DISPLAY" ] && [ -n "$WAYLAND_DISPLAY" ]; then
- xprop -root -format AT_SPI_BUS 8s -set 'AT_SPI_BUS' "$( busctl call --user org.a11y.Bus /org/a11y/bus org.a11y.Bus GetAddress | sed 's/s "\(.*\)"/\1/' )"
-fi
diff --git a/etc/xdg/plasma-workspace/env/gtk2_rc_files.sh b/etc/xdg/plasma-workspace/env/gtk2_rc_files.sh
deleted file mode 100644
index 18d9746..0000000
--- a/etc/xdg/plasma-workspace/env/gtk2_rc_files.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-GTK2RC_FILE=/usr/share/themes/Adwaita/gtk-2.0/gtkrc
-GTK2RC_KDE4=/usr/share/kde-settings/kde-profile/default/gtkrc-2.0-kde4
-GTK2RC_KDE4_HOME=${HOME}/.gtkrc-2.0-kde4
-
-if [ -f "${GTK2RC_FILE}" -a -f "${GTK2RC_KDE4}" -a ! -f "${GTK2RC_KDE4_HOME}" ]; then
- install -m644 -p "${GTK2RC_KDE4}" "${GTK2RC_KDE4_HOME}"
-fi
-
-if [ -f "${GTK2RC_KDE4_HOME}" ];then
- if [ -z "${GTK2_RC_FILES}" ]; then
- GTK2_RC_FILES=${GTK2RC_KDE4_HOME}
- elif ! echo ${GTK2_RC_FILES} | /bin/grep -q ${GTK2RC_KDE4_HOME} ; then
- GTK2_RC_FILES=${GTK2_RC_FILES}:${GTK2RC_KDE4_HOME}
- fi
- export GTK2_RC_FILES
-fi
-
-unset GTK2RC_FILE GTK2RC_KDE4 GTK2RC_KDE4_HOME
-
diff --git a/etc/xdg/plasma-workspace/env/gtk_scrolling.sh b/etc/xdg/plasma-workspace/env/gtk_scrolling.sh
deleted file mode 100644
index aec840a..0000000
--- a/etc/xdg/plasma-workspace/env/gtk_scrolling.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# see https://bugzilla.redhat.com/show_bug.cgi?id=1226465#c20
-if [ -z "${GDK_CORE_DEVICE_EVENTS}" ]; then
-GDK_CORE_DEVICE_EVENTS=1
-export GDK_CORE_DEVICE_EVENTS
-fi
diff --git a/etc/xdg/plasma-workspace/env/ssh-agent.sh b/etc/xdg/plasma-workspace/env/ssh-agent.sh
deleted file mode 100644
index 4590723..0000000
--- a/etc/xdg/plasma-workspace/env/ssh-agent.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ "$SSH_AUTH_SOCK" = "" ]; then
-SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
-export SSH_AUTH_SOCK
-fi
\ No newline at end of file
More information about the Neon-commits
mailing list