Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/283597
Change subject: Update upstream update scripts ...................................................................... Update upstream update scripts * Allow to run any directory * Leaving stuff on /tmp was not nice * Git pull was run on wrong directory Change-Id: Ia7f82de55c9bd446c29afc0684660ed00b6585bf --- M scripts/update-jquery-i18n.sh M scripts/update-jquery-ime.sh M scripts/update-jquery-uls.sh M scripts/update-jquery-webfonts.sh 4 files changed, 55 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/97/283597/1 diff --git a/scripts/update-jquery-i18n.sh b/scripts/update-jquery-i18n.sh index 537164b..4471cf7 100755 --- a/scripts/update-jquery-i18n.sh +++ b/scripts/update-jquery-i18n.sh @@ -1,17 +1,21 @@ #!/bin/bash -DEST="../lib/jquery.i18n"; -CLONEDIR="/tmp/jquery.i18n"; -HERE=$(pwd); -UPSTREAM="https://github.com/wikimedia/jquery.i18n.git";; +BASEDIR="`dirname \"$0\"`/.." +BASEDIR="`( cd \"$DIRSCRIPT\" && pwd )`" -echo -e "Getting latest jquery.i18n from $UPSTREAM\n"; +DEST="$BASEDIR/lib/jquery.i18n"; +CLONEDIR="$BASEDIR/vendor/jquery.i18n"; + +UPSTREAM="https://github.com/wikimedia/jquery.i18n.git"; + +echo "Getting latest jquery.i18n from $UPSTREAM" if [ -d $CLONEDIR ]; then - git pull; + cd $CLONEDIR + git pull else - git clone $UPSTREAM $CLONEDIR; + git clone $UPSTREAM $CLONEDIR fi -cd "$HERE"; -cp -rf $CLONEDIR/src/* $DEST +rm -rf "$DEST/*" +cp -r $CLONEDIR/src/* $DEST diff --git a/scripts/update-jquery-ime.sh b/scripts/update-jquery-ime.sh index bb5e8b2..aef40ef 100755 --- a/scripts/update-jquery-ime.sh +++ b/scripts/update-jquery-ime.sh @@ -1,20 +1,25 @@ #!/bin/bash -DEST="../lib/jquery.ime"; -CLONEDIR="/tmp/jquery.ime"; -HERE=$(pwd); -UPSTREAM="https://github.com/wikimedia/jquery.ime.git";; +BASEDIR="`dirname \"$0\"`/.." +BASEDIR="`( cd \"$DIRSCRIPT\" && pwd )`" -echo -e "Getting latest jquery.ime from $UPSTREAM\n"; +DEST="$BASEDIR/lib/jquery.ime"; +CLONEDIR="$BASEDIR/vendor/jquery.ime"; + +UPSTREAM="https://github.com/wikimedia/jquery.ime.git"; + +echo "Getting latest jquery.ime from $UPSTREAM" if [ -d $CLONEDIR ]; then - git pull; + cd $CLONEDIR + git pull else - git clone $UPSTREAM $CLONEDIR; + git clone $UPSTREAM $CLONEDIR fi -cd $CLONEDIR; -npm install; -grunt copy concat; -cd "$HERE"; -cp -rf $CLONEDIR/dist/jquery.ime/{images,css,rules,jquery.ime.js} $DEST; +cd $CLONEDIR +npm install +$CLONEDIR/node_modules/.bin/grunt copy concat + +rm -rf "$DEST/*" +cp -rf $CLONEDIR/dist/jquery.ime/{images,css,rules,jquery.ime.js} $DEST diff --git a/scripts/update-jquery-uls.sh b/scripts/update-jquery-uls.sh index 8797d66..014bee3 100755 --- a/scripts/update-jquery-uls.sh +++ b/scripts/update-jquery-uls.sh @@ -1,17 +1,21 @@ #!/bin/bash -DEST="../lib/jquery.uls"; -CLONEDIR="/tmp/jquery.uls"; -HERE=$(pwd); -UPSTREAM="https://github.com/wikimedia/jquery.uls.git";; +BASEDIR="`dirname \"$0\"`/.." +BASEDIR="`( cd \"$DIRSCRIPT\" && pwd )`" -echo -e "Getting latest jquery.uls from $UPSTREAM\n"; +DEST="$BASEDIR/lib/jquery.uls"; +CLONEDIR="$BASEDIR/vendor/jquery.uls"; -if [ -d $CLONEDIR ]; then - git pull; +UPSTREAM="https://github.com/wikimedia/jquery.uls.git"; + +echo "Getting latest jquery.uls from $UPSTREAM" + +if [ -d $CLONEDIR ]; then + cd $CLONEDIR + git pull else - git clone $UPSTREAM $CLONEDIR; + git clone $UPSTREAM $CLONEDIR fi -cd "$HERE"; +rm -rf "$DEST/*" cp -rf $CLONEDIR/{images,css,src,i18n} $DEST diff --git a/scripts/update-jquery-webfonts.sh b/scripts/update-jquery-webfonts.sh index f2ff811..d64d3d7 100755 --- a/scripts/update-jquery-webfonts.sh +++ b/scripts/update-jquery-webfonts.sh @@ -1,17 +1,21 @@ #!/bin/bash -DEST="../lib/"; -CLONEDIR="/tmp/jquery.webfonts"; -HERE=$(pwd); -UPSTREAM="https://github.com/wikimedia/jquery.webfonts.git";; +BASEDIR="`dirname \"$0\"`/.." +BASEDIR="`( cd \"$DIRSCRIPT\" && pwd )`" -echo -e "Getting latest jquery.webfonts from $UPSTREAM\n"; +DEST="$BASEDIR/lib/"; +CLONEDIR="$BASEDIR/vendor/jquery.wefonts"; + +UPSTREAM="https://github.com/wikimedia/jquery.webfonts.git"; + +echo "Getting latest jquery.wefonts from $UPSTREAM" if [ -d $CLONEDIR ]; then - git pull; + cd $CLONEDIR + git pull else - git clone $UPSTREAM $CLONEDIR; + git clone $UPSTREAM $CLONEDIR fi -cd "$HERE"; +rm -rf "$DEST/*" cp -rf $CLONEDIR/src/* $DEST -- To view, visit https://gerrit.wikimedia.org/r/283597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7f82de55c9bd446c29afc0684660ed00b6585bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Nikerabbit <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
