Changeset 209
- Timestamp:
- 10/21/11 13:42:11 (12 years ago)
- Location:
- trunk/plugins/DreamboxPlugin/web
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/plugins/DreamboxPlugin/web/installer-template.sh
r207 r209 58 58 { 59 59 60 if [ $(ps | grep cspagent.sh | grep -v grep | wc -l) -ge 1 ] ; then60 if [ $(ps | grep cspagent.sh | grep -v grep | wc -l) -ge 1 ] || [ $(ps x | grep cspagent.sh | grep -v grep | wc -l) -ge 1 ]; then 61 61 echo "output: CSP Agent allready running. Skipping ..." 62 62 else … … 89 89 #Osd httpauth password" >> /var/etc/cspagent.conf 90 90 91 if [ $(ps | grep neutrino | grep -v grep | wc -l) -ge 1 ] ; then91 if [ $(ps | grep neutrino | grep -v grep | wc -l) -ge 1 ] || [ $(ps x | grep neutrino | grep -v grep | wc -l) -ge 1 ]; then 92 92 if [ $(uname -m | grep ppc | wc -l) -ge 1 ]; then 93 93 echo "OSDPASS=dbox2" >> /var/etc/cspagent.conf … … 169 169 echo "output: Using AAF method..." 170 170 aaf_image 171 elif [ $(cat / etc/issue.net | grep -i bluepeer| wc -l) -ge 1 ]; then172 echo "output: BluePeer Imagedetected."173 echo "output: Using BluePeermethod..."174 blue_peer171 elif [ $(cat /proc/cpuinfo | grep -i coolstream | wc -l) -ge 1 ]; then 172 echo "output: Coolstream detected." 173 echo "output: Using Coolstream method..." 174 coolstream 175 175 else 176 176 RUNLEVELS="2 3 4" … … 188 188 189 189 echo "output: CSP Agent installed. Starting service..." 190 /etc/init.d/cspagent start190 check_running_agent 191 191 192 192 elif [ $(grep "Sportster Pro" /etc/issue.net | wc -l) -ge 1 ]; then … … 236 236 } 237 237 238 blue_peer()238 coolstream() 239 239 { 240 240 if [ -e /etc/init.d/cspagent ]; then … … 245 245 echo "output: CSP Agent start script now active at system startup ..." 246 246 fi 247 check_running_agent 247 248 else 248 249 echo "output: Error: /etc/init.d/cspagent not found. Skipping ..." … … 261 262 echo "output: CSP Agent allready installed. Skipping ..." 262 263 fi 264 check_running_agent 263 265 else 264 266 echo "output: Error: /etc/init.d/autostart/start.sh not found. Skipping ..." -
trunk/plugins/DreamboxPlugin/web/open/cspagent.sh
r208 r209 1 1 #!/bin/ash 2 2 3 AGENTV=1.1. 03 AGENTV=1.1.2 4 4 SKIPSLEEP=true 5 5 PIDFILE=/tmp/cspagent.pid … … 27 27 get_osd_manager() 28 28 { 29 if [ $(ps | grep neutrino | grep -v grep | wc -l) -ge 1 ] 29 # some images have busybox that recognized the x parameter for ps, some other dont know about this parameter 30 if [ $(ps x | grep neutrino | grep -v grep | wc -l) -ge 1 ] || [ $(ps | grep neutrino | grep -v grep | wc -l) -ge 1 ] 30 31 then 31 32 OSDTYPE="neutrino" … … 174 175 IMGINFO=$(echo $YWEBOUT | grep version | sed 's/version=//g') 175 176 IFS=$OIFS 176 177 178 # some images dont have imagename set in yweb version page, so list such images here 177 179 if [ $OSDVER -eq 2 ] && [ -z $IMGGUESS ]; then 178 180 if [ $(cat /etc/issue.net | grep -i bluepeer | wc -l) -ge 1 ]; then … … 189 191 elif [ $(ps | grep gdaemon | grep -v grep | wc -l) -ge 1 ] || [ -e /etc/gemini_dissociation.txt ]; then 190 192 IMGGUESS="Gemini" 191 elif [ $(ps | grep plimgr | grep -v grep | wc -l) -ge 1 ] ; then193 elif [ $(ps | grep plimgr | grep -v grep | wc -l) -ge 1 ] || $(ps x | grep plimgr | grep -v grep | wc -l) -ge 1 ]; then 192 194 IMGGUESS="PLi" 193 195 elif [ -e /usr/bin/blackholesocker ] || [ $(grep -i dream-elite /etc/image-version | wc -l) -ge 1 ]; then … … 201 203 elif [ -e /etc/image-version ]; then 202 204 IMGGUESS=$(grep comment /etc/image-version | sed 's/comment=//g') 203 fi204 205 # Check if GP3 Plugin exists and add marker to Image Guess206 if [ -e /etc/enigma2/gemini_plugin.conf ]; then207 IMGGUESS=$IMGGUESS"+GP3"208 205 fi 209 206
Note:
See TracChangeset
for help on using the changeset viewer.