From: Chris Koeritz Date: Fri, 10 Nov 2017 14:51:42 +0000 (-0500) Subject: Merge branch 'release-2.140.90' into development X-Git-Tag: 2.140.91^2~25 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=7c44bf4a51ba0dcd3e95cb80655a91de3a84b4e5;hp=9bb435b2e47b84e8086063089f9611231381f2c2;p=feisty_meow.git Merge branch 'release-2.140.90' into development bringing release back into dev --- diff --git a/experiments/home-.vnc/xstartup.001 b/experiments/home-.vnc/xstartup.001 deleted file mode 100755 index 40b174bf..00000000 --- a/experiments/home-.vnc/xstartup.001 +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -# set up gnome desktop environment for vnc. - -# references: -# https://www.digitalocean.com/community/tutorials/how-to-setup-vnc-for-ubuntu-12 -# https://www.digitalocean.com/community/questions/how-to-install-ubuntu-desktop-and-vnc -# https://www.centos.org/docs/5/html/5.2/Virtualization/sect-Virtualization-Tips_and_tricks-Configuring_a_VNC_Server.html -# https://ubuntuforums.org/showthread.php?t=1903220 -# https://askubuntu.com/questions/800302/vncserver-grey-screen-ubuntu-16-04-lts - -[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup -[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources - -xsetroot -solid darkgreen -vncconfig -iconic & - -####### -gnome-session --session=ubuntu & -#valid values for session that we've seen: -# ubuntu -# gnome -# 2d-gnome (?) -# unity -####### - -x-terminal-emulator -geometry 100x32 -ls -title "$VNCDESKTOP Desktop" & - -####### -# are these alternatives also? -x-session-manager & -#x-window-manager & -####### - -# we don't see this running at home, but it sure seems needed on vmbuilder. -gnome-panel & - -#gnome-settings-daemon & -#gnome-shell & - -####### -# one or the other of the window managers here. -#hmmm: but mutter doesn't work at all. -metacity & -#mutter & -####### - -nautilus & - diff --git a/experiments/home-.vnc/xstartup.002 b/experiments/home-.vnc/xstartup.002 deleted file mode 100755 index 1df643d6..00000000 --- a/experiments/home-.vnc/xstartup.002 +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -# set up gnome desktop environment for vnc. - -# references: -# https://www.digitalocean.com/community/tutorials/how-to-setup-vnc-for-ubuntu-12 -# https://www.digitalocean.com/community/questions/how-to-install-ubuntu-desktop-and-vnc -# https://www.centos.org/docs/5/html/5.2/Virtualization/sect-Virtualization-Tips_and_tricks-Configuring_a_VNC_Server.html -# https://ubuntuforums.org/showthread.php?t=1903220 -# https://askubuntu.com/questions/800302/vncserver-grey-screen-ubuntu-16-04-lts - -[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup -[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources - -xsetroot -solid darkgreen -vncconfig -iconic & - -####### -gnome-session --session=ubuntu & -#valid values for session that we've seen: -# ubuntu -# gnome -# 2d-gnome (?) -# unity -####### - -x-terminal-emulator -geometry 100x32 -ls -title "$VNCDESKTOP Desktop" & - -####### -# are these alternatives also? -x-session-manager & -#x-window-manager & -####### - -gnome-terminal-server & - -# we don't see this running at home, but it sure seems needed on vmbuilder. -gnome-panel & - -#gnome-settings-daemon & -#gnome-shell & - -####### -# one or the other of the window managers here. -#hmmm: but mutter doesn't work at all. -metacity & -#mutter --replace & -####### - -nautilus & - -# experimental additions since still getting lots of weird isssues: -indicator-multiload & -compiz & -gnome-keyring-daemon & -ibus-daemon & -zeitgeist-daemon & - -# just nice to have started already. -kwalletd & - - - diff --git a/experiments/home-.vnc/xstartup.003 b/experiments/home-.vnc/xstartup.003 deleted file mode 100755 index d2a26678..00000000 --- a/experiments/home-.vnc/xstartup.003 +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# set up gnome desktop environment for vnc. - -# references: -# https://www.digitalocean.com/community/tutorials/how-to-setup-vnc-for-ubuntu-12 -# https://www.digitalocean.com/community/questions/how-to-install-ubuntu-desktop-and-vnc -# https://www.centos.org/docs/5/html/5.2/Virtualization/sect-Virtualization-Tips_and_tricks-Configuring_a_VNC_Server.html -# https://ubuntuforums.org/showthread.php?t=1903220 -# https://askubuntu.com/questions/800302/vncserver-grey-screen-ubuntu-16-04-lts - -############################ - -# boilerplate that people seem to agree on. - -[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup -[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources - -xsetroot -solid darkgreen -vncconfig -iconic & - -############################ - -# the chaos zone. all of these are still being tested. - -####### -gnome-session --session=ubuntu & -#valid values for session that we've seen: -# ubuntu -# gnome -# 2d-gnome (?) -# unity -####### - -####### -# are these alternatives also? -x-session-manager & -#x-window-manager & -####### - -gnome-terminal-server & - -# we don't see this running at home, but it sure seems needed on vmbuilder. -gnome-panel & - -# no longer exists? -#gnome-settings-daemon & - -# do we need this? -#gnome-shell & - -####### -# one or the other of the window managers here. -#hmmm: but mutter doesn't work at all. -metacity & -#mutter --replace & -####### - -# this just brings up an initial file exploring window, although at one point i needed to -# have nautilus running to see icons on the desktop. -####right now there are no visible icons on the desktop, so is it failing? -nautilus & - -############################ - -# experimental additions since still getting lots of weird isssues: -indicator-multiload & -gnome-keyring-daemon & -ibus-daemon & -zeitgeist-daemon & - -############################ - -# these processes are just nice to have started already. -# -# you know you were going to want them. - -# password tools from kde. -kwalletd & - -############################ - -# limbo of useless boneheads. -# -# these things just don't seem to work. - -# this never ever shows up. -#x-terminal-emulator -geometry 100x32 -ls -title "$VNCDESKTOP Desktop" & - -############################ - -# ------------------------------ -# "&@}*(@^!$)_-{%:&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER - test_or_die "git push to origin: $myself" - else - # this branch is the same as the parent, so just push. - git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER - test_or_die "normal git push" - fi - + # tell git about all the files and get a check-in comment. + git commit . + test_or_die "git commit" + # upload the files to the server so others can see them. + git push 2>&1 | grep -v "X11 forwarding request failed" + if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi + test_or_die "git push" fi else # nothing there. it's not an error though. @@ -275,15 +260,10 @@ function do_update() # classic implementation, but only works with one master branch. # fixes will be forthcoming from development branch. - # snag all new files. not to everyone's liking. - git add --all . - retval=$? - # tell git about all the files and get a check-in comment. - git commit . - retval+=$? - # upload the files to the server so others can see them. - git push 2>&1 | grep -v "X11 forwarding request failed" - retval+=$? + git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi + test_or_die "git pull" + fi else # this is not an error necessarily; we'll just pretend they planned this.