Skip to content

Commit 09ff863

Browse files
committed
Revert "#255 added installing of qdbus on plasma for all supported package managers"
This reverts commit 74fbd5a.
1 parent 2738293 commit 09ff863

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

install.sh

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
2727
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
2828
sudo apt-get -y install libwayland-dev
2929
fi
30-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
31-
sudo apt-get -y install qdbus
32-
fi
3330

3431
elif [[ $(command -v pacman 2>/dev/null) ]]; then
3532
PACKAGE_MANAGER="pacman"
@@ -38,9 +35,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
3835
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
3936
sudo pacman --noconfirm --needed -S wayland
4037
fi
41-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
42-
sudo pacman --noconfirm --needed -S qdbus
43-
fi
4438

4539
elif [[ $(command -v dnf 2>/dev/null) ]]; then
4640
PACKAGE_MANAGER="dnf"
@@ -49,7 +43,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
4943
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
5044
sudo dnf -y install wayland-devel
5145
fi
52-
# https://github.com/asus-linux-drivers/asus-numberpad-driver/pull/255
5346
if [ "$DESKTOP_SESSION" == "plasma" ]; then
5447
sudo dnf -y install qdbus
5548
fi
@@ -61,9 +54,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
6154
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
6255
sudo yum -y install wayland-devel
6356
fi
64-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
65-
sudo yum -y install qdbus
66-
fi
6757

6858
elif [[ $(command -v zypper 2>/dev/null) ]]; then
6959
PACKAGE_MANAGER="zypper"
@@ -72,9 +62,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
7262
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
7363
sudo zypper --non-interactive install wayland-devel
7464
fi
75-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
76-
sudo zypper --non-interactive install qdbus
77-
fi
7865

7966
elif [[ $(command -v xbps-install 2>/dev/null) ]]; then
8067
PACKAGE_MANAGER="xbps-install"
@@ -83,9 +70,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
8370
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
8471
sudo xbps-install -Suy wayland-devel
8572
fi
86-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
87-
sudo xbps-install -Suy qdbus
88-
fi
8973

9074
elif [[ $(command -v emerge 2>/dev/null) ]]; then
9175
PACKAGE_MANAGER="portage"
@@ -94,9 +78,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
9478
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
9579
sudo emerge dev-libs/wayland
9680
fi
97-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
98-
sudo emerge dev-qt/qdbus
99-
fi
10081

10182
elif [[ $(command -v rpm-ostree 2>/dev/null) ]]; then
10283
PACKAGE_MANAGER="rpm-ostree"
@@ -105,9 +86,6 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
10586
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
10687
sudo rpm-ostree install wayland-devel
10788
fi
108-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
109-
sudo rpm-ostree install qdbus
110-
fi
11189

11290
elif [[ $(command -v eopkg 2>/dev/null) ]]; then
11391
PACKAGE_MANAGER="eopkg"
@@ -116,15 +94,11 @@ LOGS_INSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_INSTALL_LOG_FILE_NAME"
11694
if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
11795
sudo eopkg install -y wayland-devel
11896
fi
119-
if [ "$DESKTOP_SESSION" == "plasma" ]; then
120-
sudo eopkg install -y qdbus
121-
fi
12297

12398
else
12499
echo "Not detected package manager. Driver may not work properly because required packages have not been installed. Please create an issue (https://github.com/asus-linux-drivers/asus-numberpad-driver/issues)."
125100
fi
126101

127-
128102
if [[ $? != 0 ]]; then
129103
echo "Something went wrong when installing packages"
130104
source install_begin_send_anonymous_report.sh

0 commit comments

Comments
 (0)