joecannatti / soji

Terminal Based Mindful Workday System
GNU Affero General Public License v3.0
75 stars 16 forks source link

Fixes to enable soji to run on OS X #13

Closed iacobus42 closed 7 years ago

iacobus42 commented 7 years ago

I made a few changes to soji to enable it to run on OS X. They are

I used the uname to determine if the system is on OS X or not and run the correct code accordingly (OS X if the uname -a contains Darwin). It only uses the OS X specific code when on OS X, otherwise it runs the original soji code.

Since OS X and Ubuntu have different shebangs and paths required, I wrote a version of the files soji, soji.scm and Makefile with the appended OS (for_linux or for_os_x). I then wrote a very simple script to use mv the system specific files to the generic names (e.g., on OS X, soji_for_os_x becomes soji) and then run make install. A user should be able to install soji on either Ubuntu or OS X by just running sudo sh install_soji.

I have tested the repo on Ubuntu and OS X El Capitan.

joecannatti commented 7 years ago

Thanks for all this work @iacobus42 !

I will review this PR in detail this evening, but it all looks good with a quick glance.

iacobus42 commented 7 years ago

I added testing with travis to cover OS X but the OS X jobs don't seem to be starting on Travis. The OS X testing environment seems very (very) slow to start. Build 114 passed both - Build 115 (currently running) is the same as Build 114 but with an updated README.md covering the OS X-specific dependences.

joecannatti commented 7 years ago

I've had trouble in the past with the OS X builds on Travis. I'm okay with merging it without that working and I can play around with it later.

iacobus42 commented 7 years ago

I just pushed your requested edits. The OS X travis tests are passing but it takes about 15-20 minutes for the OS X jobs to even start.

Thanks!