[PC-BSD Commits] r3071 - in pbibuild/modules/powerpointviewer2007/overlay-dir: . bin

svn at pcbsd.org svn at pcbsd.org
Sat Dec 13 10:12:05 PST 2008


Author: fabry
Date: 2008-12-13 10:12:04 -0800 (Sat, 13 Dec 2008)
New Revision: 3071

Removed:
   pbibuild/modules/powerpointviewer2007/overlay-dir/header.png
   pbibuild/modules/powerpointviewer2007/overlay-dir/leftside.png
Modified:
   pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/powerpointviewer2007/overlay-dir/bin/pptview2007
Log:
fixed powerpoint viewer 2007 to work correctly for all the users

Modified: pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.RemoveScript.sh	2008-12-12 18:19:50 UTC (rev 3070)
+++ pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.RemoveScript.sh	2008-12-13 18:12:04 UTC (rev 3071)
@@ -7,3 +7,11 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 rm -fR /usr/local/bin/pptview2007
+cd /home
+for i in `ls`
+do
+if [ -e "/home/${i}/.pptview2007" ]
+then
+rm -rf /home/${i}/.pptview2007
+fi
+done

Modified: pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.SetupScript.sh	2008-12-12 18:19:50 UTC (rev 3070)
+++ pbibuild/modules/powerpointviewer2007/overlay-dir/PBI.SetupScript.sh	2008-12-13 18:12:04 UTC (rev 3071)
@@ -14,8 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
+echo 'TOTALSTEPS: 11'
+echo 'MSG: Setting up links'
+echo 'SETSTEPS: 1'
 ln -s /Programs/${PROGDIR}/.sbin/pptview2007 /usr/local/bin/pptview2007
 cd /Programs/${PROGDIR}/msttf/
+echo 'MSG: Installing Fonts: arial'
+echo 'SETSTEPS: 2'
 #CABEXTRACT MSFONTS
 /Programs/${PROGDIR}/bin/cabextract arial32.exe
 	#ARIAL.EXE
@@ -23,52 +28,68 @@
 	mv /Programs/${PROGDIR}/msttf/Ariali.TTF Arialni.ttf
 	mv /Programs/${PROGDIR}/msttf/Arialbd.TTF Arialnbd.ttf
 	mv /Programs/${PROGDIR}/msttf/Arialbi.TTF Arialnbi.ttf
+echo 'MSG: Installing Fonts: courier'
+echo 'SETSTEPS: 3'
 /Programs/${PROGDIR}/bin/cabextract courie32.exe
 	#COURIER.EXE
 	mv /Programs/${PROGDIR}/msttf/cour.ttf cour.ttf
 	mv /Programs/${PROGDIR}/msttf/courbd.ttf courbd.ttf
 	mv /Programs/${PROGDIR}/msttf/courbi.ttf courbi.ttf
 	mv /Programs/${PROGDIR}/msttf/couri.ttf couri.ttf
+echo 'MSG: Installing Fonts: comic32'
+echo 'SETSTEPS: 4'
 /Programs/${PROGDIR}/bin/cabextract comic32.exe
 	#COMIC.EXE
 	mv /Programs/${PROGDIR}/msttf/Comic.TTF comic.ttf
 	mv /Programs/${PROGDIR}/msttf/Comicbd.TTF comicbd.ttf
+echo 'MSG: Installing Fonts: georgia'
+echo 'SETSTEPS: 5'
 /Programs/${PROGDIR}/bin/cabextract georgi32.exe
 	#GEORGIA.EXE
 	mv /Programs/${PROGDIR}/msttf/Georgia.TTF georgia.ttf
 	mv /Programs/${PROGDIR}/msttf/Georgiaz.TTF georgiaz.ttf
 	mv /Programs/${PROGDIR}/msttf/Georgiab.TTF georgiab.ttf
 	mv /Programs/${PROGDIR}/msttf/Georgiai.TTF georgiai.ttf
+echo 'MSG: Installing Fonts: Times'
+echo 'SETSTEPS: 6'
 /Programs/${PROGDIR}/bin/cabextract times32.exe
 	#TIMES NEW ROMAN.EXE
 	mv /Programs/${PROGDIR}/msttf/Times.TTF times.ttf
 	mv /Programs/${PROGDIR}/msttf/Timesbd.TTF timesbd.ttf
 	mv /Programs/${PROGDIR}/msttf/Timesbi.TTF timesbi.ttf
 	mv /Programs/${PROGDIR}/msttf/Timesi.TTF timesi.ttf
+echo 'MSG: Installing Fonts: trebuc'
+echo 'SETSTEPS: 7'
 /Programs/${PROGDIR}/bin/cabextract trebuc32.exe
 	#TREBUCHET.EXE
 	mv /Programs/${PROGDIR}/msttf/trebuc.ttf trebuc.ttf
 	mv /Programs/${PROGDIR}/msttf/trebucit.ttf trebucit.ttf
 	mv /Programs/${PROGDIR}/msttf/trebucbi.ttf trebucbi.ttf
 	mv /Programs/${PROGDIR}/msttf/Trebucbd.ttf trebucbd.ttf
+echo 'MSG: Installing Fonts: verdana'
+echo 'SETSTEPS: 8'
 /Programs/${PROGDIR}/bin/cabextract verdan32.exe
 	#VERDANA.EXE
 	mv /Programs/${PROGDIR}/msttf/Verdana.TTF verdana.ttf
 	mv /Programs/${PROGDIR}/msttf/Verdanab.TTF verdanab.ttf
 	mv /Programs/${PROGDIR}/msttf/Verdanai.TTF verdanai.ttf
 	mv /Programs/${PROGDIR}/msttf/Verdanaz.TTF verdanaz.ttf
-/Programs/${PROGDIR}/bin/cabextract wd97vwr32.exe
+echo 'MSG: Installing Fonts: Webdings'
+echo 'SETSTEPS: 9'
 /Programs/${PROGDIR}/bin/cabextract webdin32.exe
 	#WEBDINGS.EXE
 	mv /Programs/${PROGDIR}/msttf/Webdings.TTF webdings.ttf
+
 #COPY ALL TO WINDOWS/FONT
+echo 'MSG: Moving Fonts files'
+echo 'SETSTEPS: 10'
 mv /Programs/${PROGDIR}/msttf/*.TTF /Programs/${PROGDIR}/PPTVIEW2007/drive_c/windows/fonts/
 mv /Programs/${PROGDIR}/msttf/*.ttf /Programs/${PROGDIR}/PPTVIEW2007/drive_c/windows/fonts/
+
+echo 'MSG: Cleaning'
+echo 'SETSTEPS: 11'
 rm -fR /Programs/${PROGDIR}/msttf
 rm -fR /Programs/${PROGDIR}/bin/cabextract
 chmod -R 777 /Programs/${PROGDIR}/PPTVIEW2007
 chmod +x /Programs/${PROGDIR}/bin/pptview2007
-#USER=`who | grep :0 | cut -f 1 -d " "`
-#chown ${USER} /Programs/${PROGDIR}/PPTVIEW2007
-chown ${USERNAME}:operator /Programs/${PROGDIR}/PPTVIEW2007
 echo "LAUNCHCLOSE: /usr/local/bin/pptview2007"

Modified: pbibuild/modules/powerpointviewer2007/overlay-dir/bin/pptview2007
===================================================================
--- pbibuild/modules/powerpointviewer2007/overlay-dir/bin/pptview2007	2008-12-12 18:19:50 UTC (rev 3070)
+++ pbibuild/modules/powerpointviewer2007/overlay-dir/bin/pptview2007	2008-12-13 18:12:04 UTC (rev 3071)
@@ -1,6 +1,15 @@
-#!/bin/sh
-PROGDIR="CHANGE"
+!/bin/sh
+PROGDIR="PowerpointViewer20071.1.9_1"
+if [ -e "${HOME}/.pptview2007" ]
+then
+  rm -R ${HOME}/.pptview2007
+fi
+mkdir -p ${HOME}/.pptview2007
+ln -s /Programs/${PROGDIR}/PPTVIEW2007/drive_c ${HOME}/.pptview2007/drive_c
+ln -s /Programs/${PROGDIR}/PPTVIEW2007/system.reg ${HOME}/.pptview2007/system.reg
+ln -s /Programs/${PROGDIR}/PPTVIEW2007/user.reg ${HOME}/.pptview2007/user.reg
+ln -s /Programs/${PROGDIR}/PPTVIEW2007/userdef.reg ${HOME}/.pptview2007/userdef.reg
 cd
-export WINEPREFIX="/Programs/${PROGDIR}/PPTVIEW2007"
-/Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/PPTVIEW2007/drive_c/Program Files/Microsoft Office/Office12/PPTVIEW.EXE" "$@"
+export WINEPREFIX="${HOME}/.pptview2007"
+/Programs/${PROGDIR}/bin/wine "${HOME}/.pptview2007/drive_c/Program Files/Microsoft Office/Office12/PPTVIEW.EXE" "$@"
 



More information about the Commits mailing list