bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Fix xorg-utils dependency on ubuntu/debian

Browse Source
This commit is contained in:
Bryan Roessler
2020-04-26 23:33:40 -04:00
parent f605983129
commit 49bc9ea337
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
installJRMC
View File

@@ -8,9 +8,7 @@ shopt -s extglob
# #
# To-dos: # To-dos:
# 1. Raspberry Pi support -- do not own one so difficult to test # 1. Raspberry Pi support -- do not own one so difficult to test
# 2. Arch support -- would love some testing and PRs # 2. Interactive installation (ncurses?)
# 3. ncurses graphical installer
# 4. Refactor to generalize functions
# #
# installJRMC can be run directly or sourced as a function (by sourcing this file) # installJRMC can be run directly or sourced as a function (by sourcing this file)
# Arguments: # Arguments:
@@ -443,7 +441,9 @@ EOF
unset _url_pkg unset _url_pkg
if [[ "$1" == "rpm-build" && "$ID" =~ ^(ubuntu|debian)$ ]]; then if [[ "$1" == "xorg-x11-utils" && "$ID" =~ ^(ubuntu|debian)$ ]]; then
_pkg="x11-utils"
elif [[ "$1" == "rpm-build" && "$ID" =~ ^(ubuntu|debian)$ ]]; then
_pkg="rpm" _pkg="rpm"
elif [[ "$1" == "createrepo_c" && "$ID" =~ ^(ubuntu|debian)$ ]]; then elif [[ "$1" == "createrepo_c" && "$ID" =~ ^(ubuntu|debian)$ ]]; then
_pkg="createrepo" _pkg="createrepo"
@@ -1228,8 +1228,14 @@ EOF"
# Get current desktop resolution # Get current desktop resolution
# TODO: may need to break this out into its own function and get smarter at identifying multi-monitors # TODO: may need to break this out into its own function and get smarter at identifying multi-monitors
local _res _getResolution() {
_res=$(xdpyinfo | grep dimensions | awk '{print $2}')
debug "Running: ${FUNCNAME[0]}"
installPackage xorg-x11-utils
_res=$(xdpyinfo | grep dimensions | awk '{print $2}')
}
_getResolution
if [[ -n $_novncauth ]]; then if [[ -n $_novncauth ]]; then
_exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry $_res -auth guess -forever -bg -nopw" _exec_start_cmd="/usr/bin/x11vnc -display $_display -noscr -geometry $_res -auth guess -forever -bg -nopw"