[PC-BSD Commits] r3272 - in pbibuild/modules/echolinux: . overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Thu Jan 15 13:32:56 PST 2009


Author: kris
Date: 2009-01-15 13:32:56 -0800 (Thu, 15 Jan 2009)
New Revision: 3272

Modified:
   pbibuild/modules/echolinux/build.sh
   pbibuild/modules/echolinux/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/echolinux/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/echolinux/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/echolinux/overlay-dir/bin/echolink.sh
Log:

Updated echolinux, now 100% self-contained and functioning!



Modified: pbibuild/modules/echolinux/build.sh
===================================================================
--- pbibuild/modules/echolinux/build.sh	2009-01-15 21:04:08 UTC (rev 3271)
+++ pbibuild/modules/echolinux/build.sh	2009-01-15 21:32:56 UTC (rev 3272)
@@ -10,6 +10,11 @@
 ##############################################################################
 
 # Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,XASTIR${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
+sed -e "s,CHANGEME,ECHOLINUX${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
 mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
 chmod 755 ${PBIDIR}/scripts/removepbi.sh
+
+# Save the right version number in the removepbi.sh script
+sed -e "s,CHANGEME,ECHOLINUX${PORTVER},g" ${PBIDIR}/bin/echolink.sh > /tmp/sed
+mv /tmp/sed ${PBIDIR}/bin/echolink.sh
+chmod 755 ${PBIDIR}/bin/echolink.sh

Modified: pbibuild/modules/echolinux/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/echolinux/overlay-dir/PBI.FirstRun.sh	2009-01-15 21:04:08 UTC (rev 3271)
+++ pbibuild/modules/echolinux/overlay-dir/PBI.FirstRun.sh	2009-01-15 21:32:56 UTC (rev 3272)
@@ -16,36 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-PROG="echolinux"
-PROGL="ECHOLINUX"
-BINARY="/usr/local/bin/echounix"
-
-if [ -e ${BINARY} ]
-then
-    # Looks like ${PROG} is installed, ask if they want to remove the old one
-    ls -al ${BINARY} | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "${PROGL} is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        TODEL="`ls -al ${BINARY} | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo ${TODEL} | grep ${PROG}
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${TODEL}
-        else
-          kdialog --sorry "${PROGL} could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi

Modified: pbibuild/modules/echolinux/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/echolinux/overlay-dir/PBI.RemoveScript.sh	2009-01-15 21:04:08 UTC (rev 3271)
+++ pbibuild/modules/echolinux/overlay-dir/PBI.RemoveScript.sh	2009-01-15 21:32:56 UTC (rev 3272)
@@ -7,27 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/echolinux
-rm /usr/local/bin/echoaudio
-rm /usr/local/bin/echogui
-rm /usr/local/bin/echolink.sh
-rm /usr/local/share/services/kfile_echoliux.desktop
-rm /usr/local/share/pixmaps/echolinux_48x48.png
-rm /usr/local/share/doc/echolinux
-
-# Remove the services links
-cd /Programs/${1}/autolibs/kde3/
-for i in `ls`
-do
- rm /usr/local/lib/kde3/${i}
-done
-
-# Remove the sound links
-cd /Programs/${1}/share/sounds/
-for i in `ls`
-do
- rm /usr/local/share/sounds/${i}
-done
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/echolinux/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/echolinux/overlay-dir/PBI.SetupScript.sh	2009-01-15 21:04:08 UTC (rev 3271)
+++ pbibuild/modules/echolinux/overlay-dir/PBI.SetupScript.sh	2009-01-15 21:32:56 UTC (rev 3272)
@@ -14,26 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/bin/echolink.sh /usr/local/bin/echolink.sh
-ln -s /Programs/${PROGDIR}/bin/echolinux /usr/local/bin/echolinux
-ln -s /Programs/${PROGDIR}/bin/echoaudio /usr/local/bin/echoaudio
-ln -s /Programs/${PROGDIR}/bin/echogui /usr/local/bin/echogui
-ln -s /Programs/${PROGDIR}/share/pixmaps/echolinux_48x48.png /usr/local/share/pixmaps/echolinux_48x48.png
-ln -s /Programs/${PROGDIR}/share/doc/echolinux /usr/local/share/doc/echolinux
-# Make links for services
-cd /Programs/${PROGDIR}/autolibs/echolinux/
-for i in *
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde3/${i} /usr/local/lib/kde3/${i}
-done
 
-# Make links for sounds wav files
-cd /Programs/${PROGDIR}/share/sounds/
-for i in *
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/share/sounds/${i} /usr/local/share/sounds/${i}
-done
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/echolinux
+
+echo "LAUNCHCLOSE: /Programs/bin/echolink.sh"

Modified: pbibuild/modules/echolinux/overlay-dir/bin/echolink.sh
===================================================================
--- pbibuild/modules/echolinux/overlay-dir/bin/echolink.sh	2009-01-15 21:04:08 UTC (rev 3271)
+++ pbibuild/modules/echolinux/overlay-dir/bin/echolink.sh	2009-01-15 21:32:56 UTC (rev 3272)
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+PROGDIR=CHANGEME
+
 if [ ! -e ~/.echoLinux ] ; then
 	mkdir ~/.echoLinux
 	echo "server1.echolink.org" > ~/.echoLinux/servers.txt
@@ -24,6 +27,6 @@
 
 "
 else
-	/usr/local/bin/echogui
+	/Programs/${PROGDIR}/bin/echogui
 fi
 exit 0



More information about the Commits mailing list