Merge branch 'master' into develop

This commit is contained in:
Chris Down 2018-10-31 08:31:46 +00:00
commit a80efc202e
5 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
: "${CM_DIR="${XDG_RUNTIME_DIR-"${TMPDIR-/tmp}"}"}"
CM_REAL_DELETE=0

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
: "${CM_LAUNCHER=dmenu}"
: "${CM_DIR="${XDG_RUNTIME_DIR-"${TMPDIR-/tmp}"}"}"

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
: "${CM_ONESHOT=0}"
: "${CM_OWN_CLIPBOARD=1}"

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -x
set -e
@ -18,7 +18,7 @@ else
fi
cat - "$location/../clipmenu" > /tmp/clipmenu << 'EOF'
#!/bin/bash
#!/usr/bin/env bash
shopt -s expand_aliases

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
major_version=5
@ -28,7 +28,7 @@ fi
msg 'Setting up edited clipmenu'
cat - "$location/../clipmenu" > /tmp/clipmenu << EOF
#!/bin/bash
#!/usr/bin/env bash
exec 3>&2 2> >(tee "$log" |
sed -u 's/^.*$/now/' |