From 69c3270c515fe8a4d887a81bcc914184875bd451 Mon Sep 17 00:00:00 2001 From: ackman678 Date: Sun, 10 May 2020 22:25:36 -0700 Subject: [PATCH] working wayland --- hdmi.sh | 1 + mv2figs.sh | 4 +++- nj.tmpl | 2 +- woola | 34 ++++++++++++++++++++++++++++------ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/hdmi.sh b/hdmi.sh index 3a0fd10..6ff2008 100755 --- a/hdmi.sh +++ b/hdmi.sh @@ -3,6 +3,7 @@ if [ "$1" == "-h" ] ; then echo " hdmi - setup external display if connected, else ensure the display is off - run 'xrandr' to see display interface names for input + - use for X11 window managers such as i3wm Usage: hdmi.sh hdmi.sh DP1 diff --git a/mv2figs.sh b/mv2figs.sh index 1db8f45..1f00cf4 100755 --- a/mv2figs.sh +++ b/mv2figs.sh @@ -3,7 +3,9 @@ #default image location blobFolder=$HOME/figures +# wayland: use "wl-copy" +#xorg-x11: use "xclip -selection clipboard" mv $1 $blobFolder/$1 -echo "
" | xclip -selection clipboard +echo "
" | wl-copy diff --git a/nj.tmpl b/nj.tmpl index 5027b2b..666a6f2 100644 --- a/nj.tmpl +++ b/nj.tmpl @@ -1,9 +1,9 @@ --- author: -title: date: 2018-10-26T07:17:26-07:00 tags: journal, home layout: post categories: pri +title: --- diff --git a/woola b/woola index 8f53936..f9eae98 100755 --- a/woola +++ b/woola @@ -4,10 +4,25 @@ if [ "$1" == "-h" ] ; then woola shell script - a helper app to invoke the woola markdown content build or server programs Usage: woola - woola build - - Takes an optional flag that can be 'build' to build website files instead of serving. + woola --build + By default this app will serve files from the current directory by default using woola. + + Takes an optional flags listed below. For example '--build' to build website files instead of serving. + + Optional arguments passed to woola/lib/index.js: + .option('-b, --build', 'Build and write html to path {site.options.dstPath}') + .option('-c, --config [type]', 'config.js path [config]', null) + .option('-d, --dir [type]', 'Serve from directory [dir]', './') + .option('-s, --css [type]', 'uri path to css styles [css]', null) + .option('-p, --port [type]', 'Serve on port [port]', null) + .option('-a, --address [type]', 'Serve on ip/address [address]', 'localhost') //localhost or 127.0.0.1 + .option('-h, --header [type]', 'Header .md file', null) + .option('-r, --footer [type]', 'Footer .md file', null) + .option('-n, --navigation [type]', 'Navigation .md file', null) + .option('-f, --file [type]', 'Open specific file in browser [file]') + .option('-x, --x', 'Don\'t open browser on run.') + .option('-v, --verbose', 'verbose output') Installation: place in home directory and make this file executable chmod: u=rwX,go= woola " @@ -19,7 +34,8 @@ set -e #helper startup script for woola appPath="$HOME/projects/dev/woola" configFile=$HOME/.config/woola/config.js -optFlag=${1:-serve} +# optFlag=${1:-serve} +optFlag=$1 if [[ -e $configFile ]] && [[ ! -e config.js ]]; then ln -s $configFile config.js @@ -36,8 +52,14 @@ fi #if [[ ! -d figures ]]; then # ln -s $HOME/figures figures #fi -if [[ "$optFlag" == "build" ]]; then - node $appPath/lib/index --build +# if [[ "$optFlag" == "build" ]]; then + # node $appPath/lib/index --build +# else + # node $appPath/lib/index.js +# fi + +if [[ "$optFlag" ]]; then + node $appPath/lib/index $optFlag else node $appPath/lib/index.js fi