From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config
---
 setup.rc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'setup.rc')

diff --git a/setup.rc b/setup.rc
index 9f1986cf..2c28e049 100755
--- a/setup.rc
+++ b/setup.rc
@@ -1,9 +1,5 @@
 #!/bin/rc
 
-. ./config.rc
-
-flag e +
-
 fn usage {
 	echo 'usage: '$0' [dir]' >[1=2]
 	exit 2
@@ -11,6 +7,12 @@ fn usage {
 
 if(! ~ $#* 0 1) usage
 
+if(! [ -f config.rc ])
+	cp config.def.rc config.rc
+. ./config.rc
+
+flag e +
+
 # call this after a command capture to ensure it succeeded
 fn checkstatus {}
 
@@ -29,6 +31,8 @@ fn subgen {
 }
 
 fn gen {
+	pkg=`{basename $1}
+	checkstatus
 	if(~ $dir '' .) dir=$1
 	if not dir=$dir/$1
 
-- 
cgit v1.2.3