summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-02-14 21:52:54 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-02-14 21:52:54 (GMT)
commitd36b43424fc5063e01b8112d3fa7b432636668d0 (patch)
treed09b32c0fe848199a7e5454824f314cac3aeaef6 /abs
parent196d985d24b0205228a509110194eee0b2d47a9d (diff)
parent11a48f622ea00afdf5f61cb7fe7ba89263daa6f2 (diff)
downloadlinhes_pkgbuild-d36b43424fc5063e01b8112d3fa7b432636668d0.zip
linhes_pkgbuild-d36b43424fc5063e01b8112d3fa7b432636668d0.tar.gz
linhes_pkgbuild-d36b43424fc5063e01b8112d3fa7b432636668d0.tar.bz2
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs')
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD7
-rw-r--r--abs/core-testing/LinHES-config/README3
-rwxr-xr-xabs/core-testing/LinHES-config/systemconfig.sh78
3 files changed, 54 insertions, 34 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 2ddac13..ede626f 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,12 +1,12 @@
pkgname=LinHES-config
pkgver=1.0
-pkgrel=253
+pkgrel=263
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
pkgdesc="Install and configure your system"
depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan )
arch=('i686')
-source=(mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh)
+source=(mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh README)
install=LinHES.install
build() {
@@ -38,6 +38,9 @@ build() {
install -m 0755 timezone.bin $MVDIR/bin/timezone.bin
install -m 0755 timezip.py $MVDIR/bin/timezip.py
install -m 0755 autocard.py $MVDIR/bin/autocard.py
+
+
+ install -m 0755 README $MVDIR/README
mkdir -p $startdir/pkg/usr/bin
install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py
diff --git a/abs/core-testing/LinHES-config/README b/abs/core-testing/LinHES-config/README
new file mode 100644
index 0000000..0a8e64f
--- /dev/null
+++ b/abs/core-testing/LinHES-config/README
@@ -0,0 +1,3 @@
+README file for SCALE and beyond.
+/usr/MythVantage/README
+
diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh
index 4fdbea0..6d63f5c 100755
--- a/abs/core-testing/LinHES-config/systemconfig.sh
+++ b/abs/core-testing/LinHES-config/systemconfig.sh
@@ -424,8 +424,9 @@ do
fi
done
#everything else
-for i in miro xe romdb xine dvdcss
+for i in miro xe romdb xine dvdcss webmin
do
+ eval pkgvalue=\$${i}
case $i in
xine)
if [ x$pkgvalue = x1 ]
@@ -443,6 +444,17 @@ do
pkglistremove="$pkglistremove libdvdcss"
fi
;;
+ webmin)
+ ##Daemon_add is here because webmin is on the software page instead of the advanced screen
+ if [ x$pkgvalue = x1 ]
+ then
+ pkglistinstall="$pkglistinstall webmin"
+ daemon_add="webmin $daemon_add"
+ else
+ pkglistremove="$pkglistremove webmin"
+ daemon_remove="webmin $daemon_remove"
+ fi
+ ;;
*)
if [ x$pkgvalue = x1 ]
then
@@ -700,10 +712,10 @@ if [ x$Runncidd = x1 ]
then
ser_daemon_add="ncidd ncid $ser_daemon_add"
ser_install="ncid $ser_install"
- else
+else
ser_daemon_remove="ncidd ncid $ser_daemon_remove"
ser_remove="ncid $ser_remove"
- fi
+fi
if [ x$UseEvrouter = x1 ]
@@ -713,6 +725,9 @@ then
ser_remove="evrouter $ser_remove"
fi
+
+
+
#Setting the default, just to avoid the or statement..
#if [ x$UseHobbit = x ]
#then
@@ -1060,41 +1075,40 @@ hosttypechange="false"
for i in $LIST
- do
- echo $i
- case $i in
- misc) showmisc="true"
- ;;
- sleep) showsleep="true"
- ;;
- hostype) showhost="true"
- showX="true"
- ;;
- hostypec) hosttypechange="true"
- ;;
- advanced) showadvanced="true"
- #showhost="true"
- ;;
- audio) showaudio="true"
- ;;
- network) shownetwork="true"
- ;;
+do
+echo $i
+case $i in
+ misc) showmisc="true"
+ ;;
+ sleep) showsleep="true"
+ ;;
+ hostype) showhost="true"
+ showX="true"
+ ;;
+ hostypec) hosttypechange="true"
+ ;;
+ advanced) showadvanced="true"
+ ;;
+ audio) showaudio="true"
+ ;;
+ network) shownetwork="true"
+ ;;
advancedX) showX="true"
- ;;
- webuser) setup_web_auth
- ;;
+ ;;
+ webuser) setup_web_auth
+ ;;
restartfe) killall -9 mythfrontend
- killall -9 mythwelcome
- exit 0
- ;;
+ killall -9 mythwelcome
+ exit 0
+ ;;
reloadfe) reloadfe
- ;;
+ ;;
this_is_install) MV_NEW_INSTALL="true"
- ;;
+ ;;
- esac
- done
+ esac
+done
if [ x$MV_NEW_INSTALL = xtrue ]
then