Minor tweak to script to pull Kirigami

This just allows the script to be used when you are working locally on
Kirigami to test changes - no point in waiting for a pull from upstream
then. The only goal is to copy the files over.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-01 20:11:56 -05:00
parent 80bfccdf33
commit f19ffb28c6

View file

@ -14,6 +14,10 @@ if [ ! -d "$SRC/subsurface" ] || [ ! -d "qt-mobile" ] || [ ! -d "subsurface-core
exit 1 exit 1
fi fi
if [ "$1" = "-nopull" ] ; then
NOPULL=1
fi
# now bring in the latest Kirigami mobile components plus a couple of icons that we need # now bring in the latest Kirigami mobile components plus a couple of icons that we need
# first, get the latest from upstream # first, get the latest from upstream
# yes, this is a bit overkill as we clone a lot of stuff for just a few files, but this way # yes, this is a bit overkill as we clone a lot of stuff for just a few files, but this way
@ -24,15 +28,19 @@ cd $SRC
if [ ! -d kirigami ] ; then if [ ! -d kirigami ] ; then
git clone git://github.com/KDE/kirigami git clone git://github.com/KDE/kirigami
fi fi
pushd kirigami if [ "$NOPULL" = "" ] ; then
git pull pushd kirigami
popd git pull
popd
fi
if [ ! -d breeze-icons ] ; then if [ ! -d breeze-icons ] ; then
git clone git://anongit.kde.org/breeze-icons git clone git://anongit.kde.org/breeze-icons
fi fi
pushd breeze-icons if [ "$NOPULL" = "" ] ; then
git pull pushd breeze-icons
popd git pull
popd
fi
# now copy the components and a couple of icons into plae # now copy the components and a couple of icons into plae
MC=$SRC/subsurface/qt-mobile/qml/kirigami MC=$SRC/subsurface/qt-mobile/qml/kirigami
@ -45,7 +53,7 @@ cp -R $PMMC/* $MC/
cp $PMMC/../fallbacktheme/*qml $MC/ cp $PMMC/../fallbacktheme/*qml $MC/
# fix plugin requirement # fix plugin requirement
sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $PMMC/kirigami/qmldir sed -i -e 's/^plugin kirigamiplugin/# plugin kirigamiplugin/' $MC/qmldir
cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons
cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons