amiryal

#!/bin/bash

# Save the first argument as search pattern (the "what")
what=$1
shift

# Use colours if output goes to terminal
if [ -t 1 ]; then
    use_color="--color=always"
fi

amiryal

[merge]
    conflictstyle = diff3
    tool = three_meld
[mergetool "three_meld"]
    # Opens up four diff windows:
    # LOCAL:MERGED, BASE:LOCAL, BASE:REMOTE, LOCAL:REMOTE
    #
    # Lets you edit the MERGED file (including original diff3 markers), showing
    # you the final diff from LOCAL.  For reference, you can look in the other
    # windows to see how LOCAL and REMOTE are each different from BASE, as well

amiryal

#!/bin/sh

#   This script nicely displays the remote Git branches not merged into
# the given branch, together with the list of commits they would introduce.

# Usage:
#   For the current branch:
#     branches_unmerged
#   For the specified branch:
#     branches_unmerged origin/master

amiryal

To have the executables available in Ubuntu or Debian:

apt-get install suckless-tools

Keyboard shortcut command to choose from all windows:

/bin/sh -c 'wmctrl -l | while read i j k l; do echo $i $l; done | dmenu -i -l 16 | awk "{print \$1}" | while read i; do wmctrl -iR $i; done'

Keyboard shortcut command to choose from windows of the same process as currently active window:

amiryal

module SpawnProcess
  class NonSuccessStatus < StandardError
    attr_accessor :status
    def initialize(str, status)
      @status = status
      super(str)
    end
  end

  def self.do(*args, &block)

amiryal

Script for creating tracking branches on origin

The script attempts to be agnostic to both git version and gitconfig settings.

To mimic the script in a git alias, run the following command:

git config -g alias.mkbranch '!foo() { git fetch origin && git checkout -b "$1" "${2:-origin/master}" && git push -u origin "$1":"$1"; }; foo'

amiryal

# Nginx will still complain about opening /var/log/nginx/error.log before
# switching to stderr. When shutting down, it will also complain about not
# being able to delete /dev/null.
daemon off;
error_log stderr info;
pid /dev/null;

events {
}

amiryal

class WrittenFilesTracking
  def self.written_files
    @@written_files
  end

  def self.start_with
    @@start_with
  end

  def self.with(start_with:'./')

amiryal

#!/bin/bash

# Adapted from https://git.zx2c4.com/password-store/tree/contrib/dmenu/passmenu
# at 0b2f803fe61992.

shopt -s nullglob globstar

mode=password
case "$1" in
    '--username')

amiryal

# /etc/systemd/system/nifi.service
[Unit]
Description=Apache NiFi
After=network.target

[Service]
Type=simple
User=nifi
Group=nifi
ExecStart=/opt/nifi-latest/bin/nifi.sh run