Merge branch 'master' of github.com:cycojesus/slackbuilds
This commit is contained in:
commit
7ad49f4453
3 changed files with 19 additions and 10 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,5 +1,6 @@
|
|||
repositories/
|
||||
*.tar.?z*
|
||||
*.deb
|
||||
*.zip
|
||||
*.tgz
|
||||
*.tar
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue