#!/usr/bin/env bash in_array() { local needle=$1; shift local item for item in "$@"; do [[ $item = $needle ]] && return 0 # Found done return 1 # Not Found } move_files() ( for d in libsystemd libudev machine resolve; do mkdir src/$d-new mv -T src/$d src/$d-new/src mv -T src/$d-new src/$d done for d in basic core shared; do mv -T src/{,lib}$d done pfix=( activate analyze ask-password backlight binfmt bootchart cgls cgroups-agent cgtop cryptsetup delta escape notify nspawn path quotacheck random-seed remount-fs reply-password rfkill run timedate timesync tmpfiles tty-ask-password-agent update-done update-utmp user-sessions vconsole ) for d in "${pfix[@]}"; do mv -T src/{,systemd-}$d done mv -T {,src/journal/}catalog mv -T {shell-completion/bash/,src/kernel-install/bash-completion_}kernel-install mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install mv -T {man,src/kernel-install}/kernel-install.xml mv -T src/lib{shared,core}/linux mv -T src/{,libsystemd/}/compat-libs mkdir src/libsystemd/include mv -T src/{,libsystemd/include}/systemd mv -T src/{,machine}/nss-mymachines mv -T src/{,resolve}/nss-resolve mkdir src/system mv -T src/{,system}/systemctl mkdir src/libfirewall mv -T src/lib{shared,firewall}/firewall-util.c mv -T src/lib{shared,firewall}/firewall-util.h mkdir src/system/systemd mv -T src/{libcore,system/systemd}/main.c mv -T src/{libcore,system/systemd}/macros.systemd.in mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.conf mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.policy.in.in mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.service mv -T src/{libcore,system/systemd}/system.conf mv -T src/{libcore,system/systemd}/systemd.pc.in mv -T src/{libcore,system/systemd}/triggers.systemd.in mv -T src/{libcore,system/systemd}/user.conf mkdir src/libudev/include mv -T src/libudev/{src,include}/libudev.h mv -T {man,src/systemd-activate}/systemd-activate.xml mv -T src/libsystemd/{src,}/libsystemd.pc.in mv -T src/libsystemd/{src,}/libsystemd.sym mv -T src/libsystemd/{src,}/.gitignore mv -T src/libsystemd/{src,libsystemd-internal} mkdir src/systemd-shutdown mkdir build-aux mkdir build-aux/Makefile.{once,each}.{head,tail} touch build-aux/Makefile.{once,each}.{head,tail}/.gitignore mkdir src/libsystemd/libsystemd-journal-internal ) breakup_makefile() ( find . \( -name Makefile -o -name '*.mk' \) -delete touch .tmp.move.all files=(.tmp.move.all) file=/dev/null IFS='' while read -r line; do if [[ $line = '#@'* ]]; then file="${line#'#@'}" file="${file%% *}" elif [[ $file = all ]]; then printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null else if ! in_array "$file" "${files[@]}"; then cat .tmp.move.all > "$file" files+=("$file") fi printf '%s\n' "$line" >> "$file" fi done < <(sed -r 's|^if (.*)|ifneq ($(\1),)|' |' ) main() { set -e if [[ -n "$(git status -s)" ]] || [[ -n "$(git clean -xdn)" ]]; then echo 'There are changes in the current directory.' >&2 exit 1 fi git checkout -b postmove move_files breakup_makefile fixup_includes git add . git commit -m './move.sh' git merge -s ours lukeshu/postmove git checkout lukeshu/postmove git merge postmove git branch -d postmove } main "$@"