nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-03-11 09:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths in installed version

Browse Source 
* Read python.config from script dir
 * Make dirs for pid and run

Maybe making DESTDIR/var/run during make install is not needed because
we can expect the target system to have /var/run, but if it's missing
the CherryPy engine will fail when it tries to write the pid.  So I
added it.
This commit is contained in:
James Vasile 2013-02-07 11:30:37 -05:00
parent 9501204fcc
commit 65fe8434e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -46,7 +46,7 @@ install: default
cp share/init.d/plinth $(DESTDIR)/etc/init.d
rm -f $(DESTDIR)/usr/bin/plinth
ln -s ../lib/python2.7/plinth/plinth.py $(DESTDIR)/usr/bin/plinth
mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions
mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions $(DESTDIR)/var/log/plinth $(DESTDIR)/var/run
cp -r data/* $(DESTDIR)/var/lib/plinth
rm -f $(DESTDIR)/var/lib/plinth/users/sqlite3.distrib

2
cfg.py
View File

@ -18,7 +18,7 @@ parser = SafeConfigParser(
'pidfile':"",
'port':"",
})
parser.read('plinth.config')
parser.read(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'plinth.config'))
product_name = parser.get('Name', 'product_name')
box_name = parser.get('Name', 'box_name')