nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged: tzafrir's novendor patch.

Browse Source 
Author: Tzafrir Cohen <tzafrir@debian.org>
Description: "vendor" packages are installed as separate system debs
This commit is contained in:
Nick Daly 2013-09-08 17:34:53 -05:00
parent a97061055c
commit ec9a457e3e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,7 +13,7 @@ DATADIR=/usr/share/plinth
PYDIR=$(DATADIR)/python/plinth PYDIR=$(DATADIR)/python/plinth
## Catch-all tagets ## Catch-all tagets
default: predepend config dirs template css docs dbs default: config dirs template css docs dbs
all: default all: default
predepend: predepend:

2
modules/installed/first_boot.py
View File

@ -5,7 +5,7 @@ from plugin_mount import PagePlugin, PluginMount, FormPlugin
from modules.auth import require from modules.auth import require
from forms import Form from forms import Form
import util as u import util as u
from vendor.withsqlite.withsqlite import sqlite_db from withsqlite.withsqlite import sqlite_db
import cfg import cfg
class FirstBoot(PagePlugin): class FirstBoot(PagePlugin):

4
plinth.py
View File

@ -17,8 +17,8 @@ import util as u
from logger import Logger from logger import Logger
#from modules.auth import AuthController, require, member_of, name_is #from modules.auth import AuthController, require, member_of, name_is
from vendor.withsqlite.withsqlite import sqlite_db from withsqlite.withsqlite import sqlite_db
from vendor.exmachina.exmachina import ExMachinaClient from exmachina.exmachina import ExMachinaClient
import socket import socket
__version__ = "0.2.14" __version__ = "0.2.14"

2
start.sh
View File

@ -5,6 +5,6 @@
export PYTHONPATH export PYTHONPATH
sudo killall exmachina.py sudo killall exmachina.py
sudo vendor/exmachina/exmachina.py -v & sudo /usr/share/pyshared/exmachina/exmachina.py -v &
python plinth.py python plinth.py
sudo killall exmachina.py sudo killall exmachina.py