diff options
| -rwxr-xr-x | move.sh | 9 | ||||
| -rw-r--r-- | reset.sh | 6 |
2 files changed, 15 insertions, 0 deletions
@@ -11,6 +11,8 @@ in_array() { set -e +git checkout -b postmove + ( for d in libsystemd libudev machine resolve; do mkdir src/$d-new @@ -139,3 +141,10 @@ set -e -exec grep '#include "sd-' -l -- {} + | xargs -d $'\n' sed -ri 's|#include "(sd-[^"]*)"|#include <systemd/\1>|' ) + +git add . +git commit -m './move.sh' +git merge -s ours lukeshu/postmove +git checkout lukeshu/postmove +git merge postmove +git branch -d postmove diff --git a/reset.sh b/reset.sh new file mode 100644 index 0000000000..fe2eb19a44 --- /dev/null +++ b/reset.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e +git checkout lukeshu/premove +git branch -D postmove +git checkout . +git clean -xdf |