Commit 01877874 authored by max's avatar max

Changelog, Donation Link, xpropspy sh instead of bash, ascii art on startup

parent 6ddacd25
......@@ -22,11 +22,18 @@ stages:
# Repository latest or stable
#
# - CI_IMAGE_PREFIX=jriver
# Some prefix for images that are built in the build stage and later used
# Some prefix for images that are built in the build stage and later used
# to prevent accidently pushing the wrong image to the wrong repo when pipelines run at the same time
#
# - CI_REGISTRY
# Docker registry to use
#
# - CI_REGISTRY_IMAGE=index.docker.io/shiomax/jrivermc25
# Where to push to.
#
# - CI_REGISTRY_IMAGE_NAME=shiomax/jrivermc25
# Needed for tagging. Could be extracted from $CI_REGISTRY_IMAGE
#
# - CI_REGISTRY_USER
# - CI_REGISTRY_PASSWORD
#####################
......
......@@ -210,4 +210,21 @@ Those are inherited from the base image [jlesage/baseimage-gui](https://github.c
|`SECURE_CONNECTION`| When set to `1`, an encrypted connection is used to access the application's GUI (either via web browser or VNC client). See the [Security](https://github.com/jlesage/docker-baseimage-gui#security) section for more details. | `0` |
|`VNC_PASSWORD`| Password needed to connect to the application's GUI. See the [VNC Password](https://github.com/jlesage/docker-baseimage-gui#vnc-password) section for more details. | (unset) |
|`X11VNC_EXTRA_OPTS`| Extra options to pass to the x11vnc server running in the Docker container. **WARNING**: For advanced users. Do not use unless you know what you are doing. | (unset) |
|`ENABLE_CJK_FONT`| When set to `1`, open source computer font `WenQuanYi Zen Hei` is installed. This font contains a large range of Chinese/Japanese/Korean characters. | `0` |
\ No newline at end of file
|`ENABLE_CJK_FONT`| When set to `1`, open source computer font `WenQuanYi Zen Hei` is installed. This font contains a large range of Chinese/Japanese/Korean characters. | `0` |
# Changelog
### Version 2
- xpropspy now uses sh instead of bash (microoptimization sh is faster, but can do less)
- ascii art on startup
### Version 1
- Added Container Version
# Donations
**Paypal**
[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AV2PUTYBEJXL4)
Donations are totally optional. You are not obligated to do anything! But if you like the project, I'd not complain about a free cup of coffee.
\ No newline at end of file
......@@ -31,8 +31,8 @@ else
docker run -d \
--name=jrivertest \
--net=bridge \
-p 5800:5800 \
-p 52199:52199 \
-p 5801:5800 \
-p 52200:52199 \
-v config:/config \
jrivertest
fi;
\ No newline at end of file
#!/bin/bash
echo '--------------------------------------------------'
cat << "EOF"
___ _ _
/ __| |_ (_)___
\__ \ ' \| / _ \
|___/_||_|_\___/
EOF
echo 'Unofficial JRiver MC Image brought to you by shio!'
echo "Image Version: $(</VERSION )"
echo ''
echo 'Source: https://gitlab.shio.at/max/jrivermc-docker'
echo 'Dockerhub: https://hub.docker.com/u/shiomax'
echo ''
echo '--------------------------------------------------'
\ No newline at end of file
#!/bin/bash
#!/bin/sh
while read line; do
search=$(echo "$line" | grep "_NET_ACTIVE_WINDOW(WINDOW): window id # ")
......@@ -6,7 +6,7 @@ while read line; do
hex=$(echo "$line" | cut -c41-)
clients=$(obxprop --root | grep '^_NET_CLIENT_LIST(WINDOW)' | grep -o '[0-9]\+')
if [ "$hex" == "0x0" ]; then
if [ "$hex" = "0x0" ]; then
switch_to=$(echo $clients | awk '{print $NF}')
echo "[$(date +%d-%m-%Y_%H-%M-%S)] Changing Window to: $switch_to" >> /tmp/xpropspy.log
wmctrl -i -a $switch_to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment