Chris Koeritz [Sat, 11 Nov 2017 13:30:39 +0000 (08:30 -0500)]
Merge branch 'release-2.140.96'
the promised crucial fix
Chris Koeritz [Sat, 11 Nov 2017 13:27:14 +0000 (08:27 -0500)]
a couple other tiny fixes
Chris Koeritz [Sat, 11 Nov 2017 13:22:44 +0000 (08:22 -0500)]
last edit before going to press
Chris Koeritz [Sat, 11 Nov 2017 13:18:30 +0000 (08:18 -0500)]
even tastier
now fewer lines and the exec is out of my face.
Chris Koeritz [Sat, 11 Nov 2017 13:13:07 +0000 (08:13 -0500)]
working finally. argh.
this is a complicated bit of twisty scripting. thanks to article here for an approach that actually works for starting bash and keeping it resident, unlike several approaches that i tried: https://unix.stackexchange.com/questions/123103/how-to-keep-bash-running-after-command-execution
Chris Koeritz [Sat, 11 Nov 2017 12:53:41 +0000 (07:53 -0500)]
argh, this has to start working soon
Chris Koeritz [Sat, 11 Nov 2017 07:08:47 +0000 (02:08 -0500)]
argh, the crucial fix still not working.
it was at one point fine, but now has mutated. needs more work.
Chris Koeritz [Sat, 11 Nov 2017 06:07:01 +0000 (01:07 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
getting synched
Chris Koeritz [Sat, 11 Nov 2017 06:05:33 +0000 (01:05 -0500)]
Merge branch 'release-2.140.95'
dragging in crucial mod
Chris Koeritz [Sat, 11 Nov 2017 06:05:04 +0000 (01:05 -0500)]
starting new release to get promised change out
Chris Koeritz [Sat, 11 Nov 2017 06:03:40 +0000 (01:03 -0500)]
Merge branch 'release-2.140.94' into dev
grabbing crucial fix to be able to spin a new release
Chris Koeritz [Sat, 11 Nov 2017 06:02:34 +0000 (01:02 -0500)]
Merge branch 'release-2.140.94' of feistymeow.org:feisty_meow into release-2.140.94
merging crucial fix
Chris Koeritz [Sat, 11 Nov 2017 06:01:33 +0000 (01:01 -0500)]
crucial fix for last version, oops
Chris Koeritz [Sat, 11 Nov 2017 05:57:53 +0000 (00:57 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
getting dev in synch with new master branch
Chris Koeritz [Sat, 11 Nov 2017 05:56:30 +0000 (00:56 -0500)]
Merge branch 'release-2.140.94'
merging in the new release branch
Chris Koeritz [Sat, 11 Nov 2017 05:56:01 +0000 (00:56 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
merge with master
Chris Koeritz [Sat, 11 Nov 2017 05:54:26 +0000 (00:54 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
mergeatroids
Chris Koeritz [Sat, 11 Nov 2017 05:49:25 +0000 (00:49 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 05:47:32 +0000 (00:47 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
freakazoid, it's working
Chris Koeritz [Sat, 11 Nov 2017 05:47:30 +0000 (00:47 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 05:45:32 +0000 (05:45 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 05:45:18 +0000 (05:45 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 05:45:10 +0000 (05:45 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 05:45:05 +0000 (05:45 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 04:13:35 +0000 (23:13 -0500)]
new branch begins
Chris Koeritz [Sat, 11 Nov 2017 04:05:59 +0000 (23:05 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 04:03:39 +0000 (23:03 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 04:01:47 +0000 (23:01 -0500)]
Merge branch 'release-2.140.93'
tasty merging
Chris Koeritz [Sat, 11 Nov 2017 04:01:02 +0000 (23:01 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
merging to master
Chris Koeritz [Sat, 11 Nov 2017 03:59:31 +0000 (22:59 -0500)]
nice new tool to show version of feisty meow
Chris Koeritz [Sat, 11 Nov 2017 03:59:31 +0000 (22:59 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.93
Chris Koeritz [Sat, 11 Nov 2017 03:59:02 +0000 (22:59 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 03:51:35 +0000 (22:51 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.93
back on release branch
Chris Koeritz [Sat, 11 Nov 2017 03:50:36 +0000 (22:50 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
mergine
Chris Koeritz [Sat, 11 Nov 2017 03:50:16 +0000 (22:50 -0500)]
Merge branch 'release-2.140.93' into dev
getting release branch stuff into dev
Chris Koeritz [Sat, 11 Nov 2017 03:44:55 +0000 (22:44 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 03:28:24 +0000 (22:28 -0500)]
refurbishing for more auto-repair
launcher script cannot auto-locate itself, since it's a sourced script. so we had to try something more drastic.
Chris Koeritz [Sat, 11 Nov 2017 03:15:13 +0000 (22:15 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.93
Chris Koeritz [Sat, 11 Nov 2017 03:12:56 +0000 (22:12 -0500)]
very sweet auto-location working
the reconfigure and launch scripts now can handle if you've changed the feisty meow path and want to re-configure the codebase, even with all the wrong older variables still set.
Chris Koeritz [Sat, 11 Nov 2017 02:27:54 +0000 (21:27 -0500)]
nice fixes to generalize
added a site path parameter so we can create a basic apache site anywhere on the host.
Chris Koeritz [Sat, 11 Nov 2017 01:56:29 +0000 (20:56 -0500)]
moved feisty inits and examples etc
some cleanups for location of the examples collection and also for the feisty_inits.
Chris Koeritz [Sat, 11 Nov 2017 01:51:00 +0000 (20:51 -0500)]
fixed feisty init for root
Chris Koeritz [Sat, 11 Nov 2017 01:50:25 +0000 (20:50 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
merginx
Chris Koeritz [Sat, 11 Nov 2017 01:47:55 +0000 (01:47 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 01:47:47 +0000 (01:47 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 01:47:43 +0000 (01:47 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 01:28:53 +0000 (01:28 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 00:27:41 +0000 (19:27 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 00:08:18 +0000 (00:08 +0000)]
fixed missing dir name
Chris Koeritz [Sat, 11 Nov 2017 00:01:19 +0000 (00:01 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 23:59:36 +0000 (23:59 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 23:59:29 +0000 (23:59 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 23:59:25 +0000 (23:59 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 23:39:46 +0000 (18:39 -0500)]
also elimininated references to $HOME/feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 23:36:20 +0000 (18:36 -0500)]
tasty changes for going live
new folder for default install /opt/feistymeow.org/feisty_meow.
code and docs scrubbed for references to ~/feisty_meow and /usr/local/fred.
new variable for the feisty meow org applications (including feisty_meow codebase).
Chris Koeritz [Fri, 10 Nov 2017 23:15:26 +0000 (18:15 -0500)]
new home directory
Chris Koeritz [Fri, 10 Nov 2017 23:12:10 +0000 (18:12 -0500)]
updated connect script to new init files
Chris Koeritz [Fri, 10 Nov 2017 22:54:12 +0000 (17:54 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
merging from master
Chris Koeritz [Fri, 10 Nov 2017 22:49:18 +0000 (17:49 -0500)]
Merge branch 'release-2.140.92'
bringing in release code for 2.140.92.
this marks a fairly painful learning process for git branches, but it seems like things have stabilized now.
Chris Koeritz [Fri, 10 Nov 2017 22:48:38 +0000 (17:48 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
updated local master
Chris Koeritz [Fri, 10 Nov 2017 22:34:30 +0000 (17:34 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:32:46 +0000 (17:32 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
updates from dev branch
Chris Koeritz [Fri, 10 Nov 2017 22:31:55 +0000 (17:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
get our own mods from dev
Chris Koeritz [Fri, 10 Nov 2017 22:31:36 +0000 (17:31 -0500)]
nearly fixed the downstream pushing
Chris Koeritz [Fri, 10 Nov 2017 22:31:36 +0000 (17:31 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 22:29:10 +0000 (22:29 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:29:01 +0000 (22:29 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:28:57 +0000 (22:28 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 22:27:36 +0000 (22:27 +0000)]
Merge github.com:fredhamster/feisty_meow
funkistan
Chris Koeritz [Fri, 10 Nov 2017 22:20:38 +0000 (22:20 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
getting latest from dev
Chris Koeritz [Fri, 10 Nov 2017 22:19:15 +0000 (17:19 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
remerge
Chris Koeritz [Fri, 10 Nov 2017 22:18:45 +0000 (17:18 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
merging release
Chris Koeritz [Fri, 10 Nov 2017 22:18:30 +0000 (17:18 -0500)]
Merge branch 'release-2.140.92' into dev
getting latest from release into dev
Chris Koeritz [Fri, 10 Nov 2017 22:16:23 +0000 (22:16 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
fluffing issues
Chris Koeritz [Fri, 10 Nov 2017 22:14:47 +0000 (17:14 -0500)]
added back in build version header.
Chris Koeritz [Fri, 10 Nov 2017 21:28:39 +0000 (16:28 -0500)]
new script for careful git update
rfluffer will do the careful git update on repositories.
also experimenting with the branch state method during our pulls to see what it actually reports.
Chris Koeritz [Fri, 10 Nov 2017 21:28:39 +0000 (16:28 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
Chris Koeritz [Fri, 10 Nov 2017 21:10:06 +0000 (16:10 -0500)]
Merge branch 'release-2.140.92' into dev
getting fixes from release branch into dev branch
Chris Koeritz [Fri, 10 Nov 2017 21:09:24 +0000 (21:09 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 21:08:52 +0000 (16:08 -0500)]
mod to check if remote branch exists
Chris Koeritz [Fri, 10 Nov 2017 21:01:26 +0000 (16:01 -0500)]
updated version
starting up next release.
Chris Koeritz [Fri, 10 Nov 2017 20:48:51 +0000 (15:48 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
grabbing dev mainline
Chris Koeritz [Fri, 10 Nov 2017 20:48:35 +0000 (20:48 +0000)]
added all subfolders to make
Chris Koeritz [Fri, 10 Nov 2017 20:48:35 +0000 (20:48 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:37:39 +0000 (15:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
merging in mainline
Chris Koeritz [Fri, 10 Nov 2017 20:37:38 +0000 (15:37 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:37:12 +0000 (15:37 -0500)]
new readme
Chris Koeritz [Fri, 10 Nov 2017 20:35:27 +0000 (15:35 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Fri, 10 Nov 2017 20:34:43 +0000 (20:34 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:34:04 +0000 (15:34 -0500)]
missed the step i knew i needed
Chris Koeritz [Fri, 10 Nov 2017 20:33:10 +0000 (15:33 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
mergings
Chris Koeritz [Fri, 10 Nov 2017 20:32:21 +0000 (15:32 -0500)]
maybe the right implem
needed to do our careful update first. lots of still untested stuff that needs to work, so let's see.
Chris Koeritz [Fri, 10 Nov 2017 20:27:59 +0000 (20:27 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:26:56 +0000 (15:26 -0500)]
pseudocode
Chris Koeritz [Fri, 10 Nov 2017 20:26:56 +0000 (15:26 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 10 Nov 2017 20:25:49 +0000 (20:25 +0000)]
detweaked
Chris Koeritz [Fri, 10 Nov 2017 20:21:52 +0000 (15:21 -0500)]
added a pull on origin
had explicity omitted this before, but it's actually needed.
Chris Koeritz [Fri, 10 Nov 2017 20:17:26 +0000 (15:17 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
hmmm, missing this step in scripts
Chris Koeritz [Fri, 10 Nov 2017 20:16:44 +0000 (15:16 -0500)]
another try at the totally right steps
Chris Koeritz [Fri, 10 Nov 2017 20:15:35 +0000 (15:15 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
grabbing the latest from dev
projects / feisty_meow.git / log