packaging/Deb updated

Author: aixp

packaging/Deb/makePackage

@@ -6,16 +6,16 @@
 
 # declare -a arr=("Comm" "Cons" "Dev" "Docu" "Form" "Fig" "Lin" "Obx" "Std" "Sql" "System" "Text" "blackbox" "LICENSE.txt" "run-BlackBox")
 
-version=`cat ../../version.txt`
-buildNum=$@
-buildDate=`date +"%Y-%m-%d"`
-echo "$version"
-echo "$buildNum"
-echo "$buildDate"
+version=$(cat ../../version.txt)
+buildNum="${@}"
+buildDate=$(date +"%Y-%m-%d")
+echo "${version}"
+echo "${buildNum}"
+echo "${buildDate}"
 
 verArr=(${version//-/ })
 debVersion=${verArr[0]}'~'${verArr[1]}'.build'$buildNum
-echo "$debVersion"
+echo "${debVersion}"
 
 rm -rf build
 cp -r template build
@@ -37,9 +37,9 @@ sed -i -e 's/#VERSION#/'$debVersion'/g' changelogTmp
 gzip -9c -n changelogTmp > build/usr/share/doc/bbcb2/changelog.gz
 rm changelogTmp
 
-env FILEPATH="build/usr/lib/blackbox2/System/Rsrc" FILENAME="Strings.odc" KEY="appVersion" VALUE="$version" ./append
-env FILEPATH="build/usr/lib/blackbox2/System/Rsrc" FILENAME="Strings.odc" KEY="buildNum" VALUE="$buildNum" ./append
-env FILEPATH="build/usr/lib/blackbox2/System/Rsrc" FILENAME="Strings.odc" KEY="buildDate" VALUE="$buildDate" ./append
+env FILEPATH="build/usr/lib/blackbox2/System/Rsrc" FILENAME="Strings.odc" KEY="appVersion" VALUE="${version}"   ./append
+env FILEPATH="build/usr/lib/blackbox2/System/Rsrc" FILENAME="Strings.odc" KEY="buildNum"   VALUE="${buildNum}"  ./append
+env FILEPATH="build/usr/lib/blackbox2/System/Rsrc" FILENAME="Strings.odc" KEY="buildDate"  VALUE="${buildDate}" ./append
 
 cd build
 find . -type f -exec chmod 644 {} ";"
@@ -56,14 +56,16 @@ cd ../
 
 mkdir build/DEBIAN
 cp control build/DEBIAN/control
-sed -i -e 's/#VERSION#/'$debVersion'/g' build/DEBIAN/control
-sed -i -e 's/#VERSION#/'$debVersion'/g' build/usr/share/applications/bbcb2.desktop
-sed -i -e 's/#VERSION#/'$debVersion'/g' build/usr/share/applications/bbcb2.desktop
+sed -i -e "s/#VERSION#/${debVersion}/g" build/DEBIAN/control
+sed -i -e "s/#VERSION#/${debVersion}/g" build/usr/share/applications/bbcb2.desktop
+
 cd build
-md5deep -rl usr > DEBIAN/md5sums
+# symlinks should not be included
+# md5deep -rl usr > DEBIAN/md5sums
+find usr -type f ! -lname '*' -exec md5sum {} \; > DEBIAN/md5sums
 cd ../
 fakeroot dpkg-deb --build build
 
-newname='bbcb2-'$debVersion'_i386.deb'
-mv build.deb $newname
-lintian $newname
+newname="bbcb2-${debVersion}_i386.deb"
+mv build.deb "${newname}"
+lintian "${newname}" || true

packaging/Deb/template/usr/bin/bbcb2-shortcut

@@ -1,16 +1,5 @@
 #!/bin/sh
 
-standardDir="/usr/lib/blackbox2"
 useDir="$HOME/blackbox"
 
-# fix Ubuntu-specific problems:
-unset UBUNTU_MENUPROXY
-unset GTK_MODULES
-export LIBOVERLAY_SCROLLBAR=0
-
-mkdir -p $useDir
-
-# export LD_DEBUG=all
-env \
-	BB_STANDARD_DIR="${standardDir}" BB_USE_DIR="${useDir}" \
-	"${standardDir}"/blackboxLinux
+mkdir -p "${useDir}" && cd "${useDir}" && bbcb2