mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-05 21:28:48 +00:00
Resolve conflicts
This commit is contained in:
parent
14137d490f
commit
7ad4212e32
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./common-script.sh
|
||||
. ../common-script.sh
|
||||
|
||||
# Function to check bluetoothctl is installed
|
||||
setupBluetooth() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to auto-detect displays and set common resolution
|
||||
auto_detect_displays() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to change monitor orientation
|
||||
change_orientation() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
RESET='\033[0m'
|
||||
BOLD='\033[1m'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to duplicate displays
|
||||
duplicate_displays() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
RESET='\033[0m'
|
||||
BOLD='\033[1m'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to extend displays
|
||||
extend_displays() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to manage monitor arrangement
|
||||
manage_arrangement() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to reset scaling back to 1 (native resolution) for all monitors
|
||||
reset_scaling() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to scale smaller monitors to the highest resolution of a bigger monitor
|
||||
scale_monitors() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
# Function to set a monitor as primary
|
||||
set_primary_monitor() {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./utils/monitor-control/utility_functions.sh
|
||||
. ./utility_functions.sh
|
||||
|
||||
RESET='\033[0m'
|
||||
BOLD='\033[1m'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./common-script.sh
|
||||
. ../../common-script.sh
|
||||
|
||||
# Function to check bluetoothctl is installed
|
||||
setup_xrandr() {
|
||||
|
@ -35,26 +35,6 @@ colored_echo() {
|
|||
esac
|
||||
}
|
||||
|
||||
# Function to check the display server type
|
||||
check_display_server() {
|
||||
if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
|
||||
colored_echo "red" "You are using Wayland."
|
||||
colored_echo "red" "This script is designed for X11. It may not work correctly on Wayland."
|
||||
|
||||
if ! confirm_action "Do you want to continue anyway?"; then
|
||||
echo "Exiting script."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
elif [ "$XDG_SESSION_TYPE" = "x11" ]; then
|
||||
colored_echo "green" "You are using X11 (X-server)."
|
||||
return 0
|
||||
else
|
||||
colored_echo "red" "Unable to determine the display server type."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Function to execute xrandr commands and handle errors
|
||||
execute_command() {
|
||||
local command="$1"
|
||||
|
@ -91,5 +71,4 @@ confirm_action() {
|
|||
}
|
||||
|
||||
checkEnv
|
||||
setup_xrandr
|
||||
check_display_server
|
||||
setup_xrandr
|
|
@ -20,10 +20,6 @@ values = ["x11"]
|
|||
name = "Set Resolution"
|
||||
script = "monitor-control/set_resolutions.sh"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Set Resolution"
|
||||
script = "monitor-control/set_resolutions.sh"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Duplicate Displays"
|
||||
script = "monitor-control/duplicate_displays.sh"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
. ./common-script.sh
|
||||
. ../common-script.sh
|
||||
|
||||
# Function to check if NetworkManager is installed
|
||||
setupNetworkManager() {
|
||||
|
|
Loading…
Reference in New Issue
Block a user