diff --git a/.gitignore b/.gitignore index ab5c7286..6b6d1626 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ repositories/ *.tar.?z* +*.deb *.zip *.tgz *.tar diff --git a/e/org2blog/org2blog.SlackBuild b/e/org2blog/org2blog.SlackBuild index a82176c9..58843e34 100755 --- a/e/org2blog/org2blog.SlackBuild +++ b/e/org2blog/org2blog.SlackBuild @@ -4,7 +4,6 @@ VERSION=master_$(date +"%Y.%m.%d_%H.%M") BUILD=1 - TAG=cyco OUTPUT=/tmp TMP=/tmp/$TAG @@ -16,6 +15,7 @@ PKG=$TMP/pkg-$PRGNAM ARCH=$(uname -m) REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM +REPOSITORY_IMPORTERS=/home/installs/SlackBuilds/repositories/$PRGNAM-importers PREFIX=/usr EMACS=$(basename $(ls /usr/bin/emacs-2*)) @@ -29,21 +29,29 @@ mkdir -p $PKG # mise en place cd $TMP if [ ! -e $REPOSITORY ] ; then - git clone "http://github.com/punchagan/org2blog.git" $REPOSITORY + git clone "http://github.com/punchagan/org2blog.git" $REPOSITORY else ( cd $REPOSITORY git pull ) fi +if [ ! -e $REPOSITORY_IMPORTERS ] ; then + git clone "http://github.com/punchagan/org2blog-importers.git" $REPOSITORY_IMPORTERS +else + ( cd $REPOSITORY_IMPORTERS + git pull + ) +fi -mkdir -p $PKG$PREFIX/share/emacs/site-lisp +mkdir -p $PKG$PREFIX/share/emacs/site-lisp $PKG$PREFIX/doc/$PRGNAM cp -R $REPOSITORY $PKG$PREFIX/share/emacs/site-lisp -( cd $PKG$PREFIX/share/emacs/site-lisp/$PRGNAM - rm -fr .git - mkdir -p $PKG$PREFIX/doc/$PRGNAM - mv README* $PKG$PREFIX/doc/$PRGNAM - $EMACS -batch -f batch-byte-compile *.el -) +cd $PKG$PREFIX/share/emacs/site-lisp/$PRGNAM +$EMACS -batch -f batch-byte-compile *.el + +mv README* $PKG$PREFIX/doc/$PRGNAM +cp -R $REPOSITORY_IMPORTERS $PKG$PREFIX/doc/$PRGNAM + +rm -fr .git $PKG$PREFIX/doc/$PRGNAM/$PRGNAM-importers/.git # correction cd $PKG diff --git a/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild b/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild index b680fe3b..3c67011c 100755 --- a/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild +++ b/xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild @@ -27,7 +27,7 @@ BRANCH=${BRANCH:=latest-trunk} if [ $KEEP_TAR == "NO" ]; then [ -e firefox-*.en-US.linux-x86_64.tar.bz2 ] && for f in firefox-*.en-US.linux-x86_64.tar.bz2 ; do mv $f $f.orig ; done - WHICH_TAR=$(lftp http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/$BRANCH/ -e "cls --date ; quit" | awk '{print $4}' | grep firefox-.\*.en-US.linux-x86_64.tar.bz2 | tail -n1) + WHICH_TAR=$(lftp http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/$BRANCH/ -e "cls --date *.en-US.linux-x86_64.tar.bz2 ; quit" | awk '{print $4}' | head -n1) wget -c http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/$BRANCH/$WHICH_TAR fi