(old)Puppy Linux Discussion Forum

Code: Select all

#!/bin/dash

Code: Select all

# 8. extract package
for p in $MAIN_PKG $HELP_PKG $LANG_PKG; do
	echo $(eval echo `gettext 'Extracting $p'`)
	tar -xf ${p}.${PKGFORMAT}
done

Code: Select all

diff -ru glo-0.30/get_libreoffice glo-0.30.1/get_libreoffice
--- glo-0.30/get_libreoffice	2013-11-27 16:17:31.000000000 -0500
+++ glo-0.30.1/get_libreoffice	2015-07-02 11:09:17.000000000 -0400
@@ -41,11 +41,14 @@
 #0.27 20130219 added gui to opt out of RAM build
 #0.28 20130310 bugfix with default* files
 #0.29 20130807 bugfix for low RAM full installs
+#0.29.1 20140802 shinobar: remove large icons
+#0.29.2 20150627 shinobar: move /usr/local to /usr
 #0.30 20131128 wrap find targets in '', add / to ./ oath, add more logging, vicmz
+#0.30.1 20150701 rerwin: create package file list for /root and /etc
 
 MYPATH=$0
 MYNAME=$(basename "$0")      
-VERSION=0.30
+VERSION=0.30.1
 export TEXTDOMAIN=get_libreoffice
 export OUTPUT_CHARSET=UTF-8
 #eval_gettext() {
@@ -604,9 +607,9 @@
     if [ -f printeradmin.desktop ];then #131128
      EXECP=`grep -w Exec printeradmin.desktop`
      if [[ "$MAJ_MAJ" = 3 && $LIBOminorver -lt 4 ]];then
-     sed -i "s|$EXECP|padmin|" printeradmin.desktop
-      else
-     sed -i "s|$EXECP|Exec=${EXEC_PREFIX}printeradmin|" printeradmin.desktop
+      sed -i "s|$EXECP|padmin|" printeradmin.desktop
+     else
+      sed -i "s|$EXECP|Exec=${EXEC_PREFIX}printeradmin|" printeradmin.desktop
      fi
     fi
     
@@ -635,6 +638,13 @@
 	#MIMEICONDIR=usr/local/apps/ROX-Filer/ROX/MIME #fails, maybe need to create a skeleton and move to $HOME
 	mkdir -p ./workdir/${MIMEICONDIR}
 	cd ./workdir
+
+	#20150627 shinobar: move /usr/local to /usr
+	if [ -d ./usr/local/share ]; then
+	  mkdir -p ./usr/share
+	  mv ./usr/local/bin usr; mv ./usr/local/share/* ./usr/share && rm -fr ./usr/local
+	fi
+
 	#word
 	for word in application_msword application_rtf application_vnd.oasis.opendocument.text application_vnd.oasis.opendocument.text-template application_vnd.openxmlformats-officedocument.wordprocessingml.document
 	 do
@@ -660,6 +670,11 @@
 	#base
 	cp usr/share/icons/hicolor/48x48/apps/${LOEXEC}${LIBO_MAJ_VER}-base.png  ${MIMEICONDIR}/application_vnd.oasis.opendocument.database.png
 	
+	#20140802 shinobar: remove large icons
+	for S in 512 256 128; do
+	  rm -fr usr/share/icons/hicolor/${S}x${S}
+    done
+
 	cd -
 	#END MIME ICONS
 	#mime scripts ###########################################
@@ -728,6 +743,10 @@
 	fi
 	rm -f /tmp/libre_xtra_for_naming
 	LIBOBUILD=LibreOffice-${LIBO_VER}${LANGLIB}${EXTRA}${COMP}
+
+	#20150701 Generate root & etc file list for remastering, using squashfile name
+	[ "$(which sfs_filelist)" ] && sfs_filelist workdir ${LIBOBUILD}
+
 	echo "rxvt -bg darkgreen -fg yellow -geometry 80x10 -title \"$INFOMSG3 ${LIBOBUILD}.sfs\" -e mksquashfs workdir ${LIBOBUILD}.sfs "$OPTION"" > /tmp/get_libre_sfs
 	. /tmp/get_libre_sfs
 	rm -f /tmp/get_libre_sfs

Code: Select all

#0.30.2 20150829 L18L: kill 'please wait'; TEXT for more than 2 versions

Code: Select all

get_libreoffice-0.30.1        <<< should be 0.30.2 ??
PUPMODE = 13
en-US
pup distro = fd64-700
Is it ok to build in RAM? yes
building in /tmp
moving to /initrd/aufs/devsave

Code: Select all

#0.30.2 20150829 L18L: kill 'please wait'; TEXT for more than 2 versions
#0.30.3 20150906 L18L fixed glitch reported by step

MYPATH=$0
MYNAME=$(basename "$0")      
VERSION=0.30.3

Code: Select all

ok
/usr/bin/get_libreoffice_0.30.3: line 112: gtkdialog-splash: command not found
en-US
/usr/bin/get_libreoffice_0.30.3: line 266: kill: (3379) - No such process
Is it ok to build in RAM? yes
building in /tmp
moving to /initrd/aufs/devsave
/usr/bin/get_libreoffice_0.30.3: line 301: gtkdialog-splash: command not found