document_id
stringlengths
8
12
document
stringlengths
50
3.21k
split
stringclasses
1 value
d_bash_23200
--- +++ @@ -1,6 +1,6 @@ #!/bin/bash GH_STATUS_REPO_NAME="alphagov/govuk-content-schemas" -CONTEXT_MESSAGE="Verify collections-publisher against content schemas" +CONTEXT_MESSAGE="Verify content-tagger against content schemas" exec ./jenkins.sh
bash
d_bash_23201
--- +++ @@ -12,7 +12,7 @@ setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var public/media if [ "$APP_ENV" != 'prod' ]; then - composer install --prefer-dist --no-progress --no-suggest --no-interaction + composer install --prefer-dist --no-progress --no-interaction bin/console assets:install --no-intera...
bash
d_bash_23202
--- +++ @@ -10,5 +10,7 @@ } if which -s yard; then - alias gemyard='yard server --gems --cache --docroot=~/Library/Caches/org.yardoc/index' + which -s thin && gemyardserver=' --server=thin' + alias gemyard='yard server --gems --cache --docroot=~/Library/Caches/org.yardoc/index'"$gemyardserver" + unset gem...
bash
d_bash_23203
--- +++ @@ -1,10 +1,13 @@ #!/bin/bash -x + +set -e + export FACTER_govuk_platform=test export RAILS_ENV=test export DISPLAY=":99" +export GOVUK_APP_DOMAIN=dev.gov.uk bundle install --path "${HOME}/bundles/${JOB_NAME}" --deployment bundle exec rake stats bundle exec rake ci:setup:testunit test -RESULT=$? -exi...
bash
d_bash_23204
--- +++ @@ -13,6 +13,10 @@ echo "Start job with id $SLURM_JOB_ID" echo $SLURM_JOB_ID >> pass3_job_id.txt +# copy video to temporary location if necessary +mkdir -p {VIDEO_FOLDER_TEMPORARY} +rsync -avzh --progress {VIDEO_FILE_SOURCE} {VIDEO_FOLDER_TEMPORARY} + # increase process limit, because ffmpeg needs many t...
bash
d_bash_23205
--- +++ @@ -6,6 +6,7 @@ git clone /var/cache/git/django/feincms.git git clone /var/cache/git/django/mptt.git cd .. +git clone /var/cache/git/django/feinheit.git ln -s lib/django/django django ln -s lib/feincms/feincms feincms ln -s lib/mptt/mptt mptt
bash
d_bash_23206
--- +++ @@ -24,4 +24,3 @@ pip install -U pip setuptools awscli boto3 "nitor-deploy-tools$DEPLOYTOOLS_VERSION" source $(n-include common_tools.sh) -ln -snf /usr/bin/lpass_$(system_type_and_version) /usr/bin/lpass
bash
d_bash_23207
--- +++ @@ -8,7 +8,7 @@ readonly ownership="pugixml Upstream <robot@adios2>" readonly subtree="thirdparty/pugixml/pugixml" readonly repo="https://github.com/zeux/pugixml.git" -readonly tag="v1.8.1" +readonly tag="master" readonly shortlog="true" readonly paths=" src/pugiconfig.hpp
bash
d_bash_23208
--- +++ @@ -1,11 +1,10 @@ genymotion_peco(){ if [ -z "$GENYMOTION_APP_HOME" ]; then - echo "GENYMOTION_APP_HOME is empty. Use '/Applications/Genymotion.app/' instead this time." - player="/Applications/Genymotion.app/Contents/MacOS/player" - else - player="$GENYMOTION_APP_HOME/Contents/MacOS/player" +...
bash
d_bash_23209
--- +++ @@ -1,19 +1,23 @@ #!/usr/bin/env bash /usr/bin/mysqld_safe & sleep 10s cd /var/www + PLUGINS=(rest-api wp-basic-auth) sudo -u www-data -i env PLUGINS="`echo ${PLUGINS[@]}`" sh <<'EOF' echo "Running wp-cli commands in `pwd` as `whoami`" echo "wp core install..." -wp core install --url="http://example....
bash
d_bash_23210
--- +++ @@ -1,5 +1,5 @@ if [ -d "/usr/lib/jvm/jetbrains-jre" ]; then - IDEA_JDK=/usr/lib/jvm/jetbrains-jre + export IDEA_JDK=/usr/lib/jvm/jetbrains-jre fi # Fix idea on sway
bash
d_bash_23211
--- +++ @@ -1,5 +1,8 @@ -#!/bin/bash +#!/bin/sh +for var +do cd `mktemp -d` -curl "https://aur.archlinux.org/packages/`expr substr $1 1 2`/$1/$1.tar.gz" | tar xz -cd $1 +curl "https://aur.archlinux.org/packages/`expr substr $var 1 2`/$var/$var.tar.gz" | tar xz +cd $var makepkg -si +done
bash
d_bash_23212
--- +++ @@ -14,7 +14,7 @@ upload() { for pt in "${JSON_DIR}/"product-type-*.json; do echo "Uploading product type from file ${pt} ..." - curl -H "Authorization: Bearer ${ACCESS_TOKEN}" -X POST -d @"${pt}" "https://api.sphere.io/${PROJECT_KEY}/product-types" + curl -H "Content-Type: application/json" -H...
bash
d_bash_23213
--- +++ @@ -21,7 +21,7 @@ rm -rf $ZMQ_DIR # Get the C++ Wrapper zmq.hpp -wget https://raw.githubusercontent.com/zeromq/cppzmq/master/zmq.hpp --no-check-certificate +wget https://raw.githubusercontent.com/zeromq/cppzmq/master/zmq.hpp mv zmq.hpp $THIRD_PARTY_DIR/include # Get MPICH2
bash
d_bash_23214
--- +++ @@ -1,29 +1,7 @@ #!/bin/bash -let "suc = 0" -let "fail = 0" -NUMTEST=79 +# Always run in script-dir +DIR=`dirname $0` +cd $DIR -for (( tno = 1 ; $tno <= $NUMTEST ; tno = $tno + 1 )); do - ./testCheck.sh $tno - if [ "$?" -eq "0" ]; then - echo "OK" - let "suc = $(($suc + 1))" - else - echo...
bash
d_bash_23215
--- +++ @@ -29,7 +29,7 @@ ########################################################### cd / -curl -L https://download.docker.com/linux/static/stable/x86_64/docker-19.03.2.tgz | tar zx +curl -L https://download.docker.com/linux/static/stable/x86_64/docker-19.03.5.tgz | tar zx mv /docker/* /bin/ chmod +x /bin/dock...
bash
d_bash_23216
--- +++ @@ -1,7 +1,2 @@ #! /bin/bash - -set -e - -if python manage.py makemigrations --dry-run --exit; then - exit 1 -fi +exec python manage.py makemigrations --check
bash
d_bash_23217
--- +++ @@ -6,7 +6,7 @@ set -o nounset set -o errexit -DOTFILES=( gemrc gitconfig gvimrc inputrc irbrc pryrc screenrc tmux.conf vimrc wgetrc zshrc ) +DOTFILES=( gemrc gitconfig gvimrc inputrc irbrc pryrc screenrc tmux.conf vimrc zshrc ) SSH_CONFIG=ssh_config abort() {
bash
d_bash_23218
--- +++ @@ -6,9 +6,6 @@ # shellcheck source=/dev/null source "$dir/conf/env.sh" -echo Stowing home directory files -stow -Rt "$HOME" home +stow -Rvt "$HOME" home +stow -Rvt "$XDG_CONFIG_HOME" xdg -echo Stowing XDG config files -stow -Rt "$XDG_CONFIG_HOME" xdg -
bash
d_bash_23219
--- +++ @@ -1,5 +1,5 @@ #!/bin/bash set -e -version="20.10.17" +version="20.10.18" echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz";
bash
d_bash_23220
--- +++ @@ -7,7 +7,7 @@ if [[ "$@" =~ : ]]; then /usr/bin/scp $@; else - echo "You forgot the colon dumbass!"; + echo "You forgot the colon"; fi }
bash
d_bash_23221
--- +++ @@ -17,6 +17,7 @@ conda create -q -n test3 python=3.5 notebook sympy pysym symcxx pip pytest pytest-cov pytest-flakes pytest-pep8 python-symengine source activate test3 python setup.py install +python -m pip install diofant # (cd /; python -m pytest --pyargs $1) PYTHONPATH=$(pwd) ./scripts/run_tests.sh -...
bash
d_bash_23222
--- +++ @@ -9,7 +9,7 @@ docker login -u=serviceaccount --password-stdin ${OPENSHIFT_REGISTRY} < /var/run/secrets/kubernetes.io/serviceaccount/token # Iterates through all images that have the name of the repository we are interested in in it -for FULL_IMAGE in $(docker image ls --format "{{.Repository}}:{{.Tag}}"...
bash
d_bash_23223
--- +++ @@ -36,7 +36,7 @@ mcollective nailgun nginx -openstack-keystone +httpd ostf rabbitmq-server oswl_flavor_collectord
bash
d_bash_23224
--- +++ @@ -12,5 +12,5 @@ } function prepend_datetime() { - awk '{ gsub(/\\n/, ""); print "[" strftime("%Y-%m-%d %H:%M:%S%z") "]", $0; fflush(""); }' + awk -W interactive '{lineWithDate="echo [`date +\"%Y-%m-%d %H:%M:%S%z\"`] \"" $0 "\""; system(lineWithDate) }' }
bash
d_bash_23225
--- +++ @@ -24,7 +24,7 @@ for item in $LIST do arch=".amd64" - if [ -n "$TRAVIS_CPU_ARCH" ]; + if [ ! -z "$TRAVIS_CPU_ARCH" ]; then arch=".$TRAVIS_CPU_ARCH" fi @@ -33,7 +33,7 @@ echo " Starting: byjg/php:${item}" echo "=====================================================" - ...
bash
d_bash_23226
--- +++ @@ -18,7 +18,10 @@ else # If multiple log files, just use first found log_file=`find . -iname '*.log' -print -quit` - # TODO if no file found, exit with message + if [[ $log_file == '' ]]; then + echo 'No file matching *.log found, exiting' + exit 0 + fi fi if [[ $@ != *"...
bash
d_bash_23227
--- +++ @@ -2,10 +2,21 @@ set -e -cd /srv/staging/website +ROOT_DIR=/srv/staging +DJANGODIR=$ROOT_DIR/website/ + +source $ROOT_DIR/venv/bin/activate +export $(cat .env.staging | xargs) + +cd $DJANGODIR git pull + npm run build npm run build-prod + +./manage.py collectstatic --clear --noinput \ + --ignore l...
bash
d_bash_23228
--- +++ @@ -30,7 +30,7 @@ } install_golang_deps() { - go get github.com/MasterMinds/glide + go get github.com/Masterminds/glide } build() {
bash
d_bash_23229
--- +++ @@ -6,6 +6,8 @@ shift done } + +count=0 for file in *.yml do @@ -20,4 +22,8 @@ grep "${key} ${value}" ${base}.output > /dev/null || echo "FAILED:" $(shyaml get-value name ${file} < ${file}) done + + let count=count+1 done + +echo Ran ${count} tests.
bash
d_bash_23230
--- +++ @@ -1,4 +1,4 @@ -NETWORKING_NEC_DIR=$(cd $(dirname ${BASH_SOURCE}/..) && pwd) +NETWORKING_NEC_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd) function install_networking_nec { setup_develop $NETWORKING_NEC_DIR
bash
d_bash_23231
--- +++ @@ -24,4 +24,4 @@ rm -f acopost.spec rm -f *~ rm -rf src/.deps -rm -r tests/*.test +rm -rf tests/*.test
bash
d_bash_23232
--- +++ @@ -2,6 +2,6 @@ cd ../../linux/arch/arm/boot/dts/overlays -ls -l *.dts | sed s:dts:dtb: | awk '{ print " overlays/"$9, "\\" }' +ls -l *.dts | sed s:-overlay\.dts:\.dtbo: | awk '{ print " overlays/"$9, "\\" }' cd $OLDPWD
bash
d_bash_23233
--- +++ @@ -2,7 +2,7 @@ # Substitute configuration for VARIABLE in `env | cut -f1 -d=`; do - sed -i "s,{{ $VARIABLE }},${!VARIABLE},g" /etc/postfix/*.cf + sed -i "s={{ $VARIABLE }}=${!VARIABLE}=g" /etc/postfix/*.cf done # Actually run Postfix
bash
d_bash_23234
--- +++ @@ -12,8 +12,26 @@ echo "error: directory ${fname} not found" exit fi + cd ${fname} -zip -r ../${fname}.zip * +type zip > /dev/null 2>&1 +if [[ $? == 0 ]]; then + ZIP='zip' +else + type 7z > /dev/null 2>&1 + if [[ $? == 0 ]]; then + ZIP='7z u' + else + echo "Error: Either...
bash
d_bash_23235
--- +++ @@ -16,9 +16,9 @@ continue fi # Update the version number of this crate to $version. - sed -i "" -e "s/^version = .*/version = \"$version\"/" "$crate/Cargo.toml" + sed -i.bk -e "s/^version = .*/version = \"$version\"/" "$crate/Cargo.toml" # Update the required version number of a...
bash
d_bash_23236
--- +++ @@ -7,4 +7,4 @@ git_checkout ${fiat_crypto_CI_BRANCH} ${fiat_crypto_CI_GITURL} ${fiat_crypto_CI_DIR} -( cd ${fiat_crypto_CI_DIR} && make -j ${NJOBS} ) +( cd ${fiat_crypto_CI_DIR} && make -j ${NJOBS} lite )
bash
d_bash_23237
--- +++ @@ -1,2 +1,4 @@ cd packages/angular-meteor-data VELOCITY_TEST_PACKAGES=1 meteor test-packages --velocity ./ +cd ../angular-meteor-auth +VELOCITY_TEST_PACKAGES=1 meteor test-packages --velocity ./
bash
d_bash_23238
--- +++ @@ -18,8 +18,8 @@ echo "exec /usr/local/bin/dockerd" > /etc/init/dockerd.conf fi -echo "Restarting dockerd..." -restart dockerd > /dev/null +echo "Starting dockerd..." +start dockerd > /dev/null echo "Finished!" echo
bash
d_bash_23239
--- +++ @@ -2,9 +2,12 @@ set -eu dir_make() { - mkdir -m700 -p "/tmp/$USER/$1" + for dir in "$@"; do + mkdir -m700 -p "/tmp/$USER/$dir" + done } +mkdir -m750 "/tmp/$USER" dir_make cache dir_make mutt/{headers,bodies} dir_make pacaur
bash
d_bash_23240
--- +++ @@ -7,6 +7,8 @@ mix compile --force --warnings-as-errors mix credo --mute-exit-status +mix credo --strict --mute-exit-status +mix credo --strict --enable-disabled-checks . --mute-exit-status mix credo --debug --mute-exit-status mix credo list --mute-exit-status mix credo suggest --mute-exit-status
bash
d_bash_23241
--- +++ @@ -5,7 +5,7 @@ alias g='git status' alias u='pbpaste | uglifyjs --mangle 2>/dev/null | pbcopy' alias strip-meta='exiftool $@ "-All=" -overwrite_original' -alias fuck-this-shit='git reset --hard HEAD; git clean -fd' +alias fuck-this-shit='git stash; git stash drop; git gc; git prune -v;' alias lipsum='lor...
bash
d_bash_23242
--- +++ @@ -2,7 +2,7 @@ rm -rf rtd_tests/builds/ export PYTHONPATH=`pwd`:$PYTHONPATH export DJANGO_SETTINGS_MODULE=settings.test -py.test +py.test $1 exit=$? cd - exit $exit
bash
d_bash_23243
--- +++ @@ -6,6 +6,7 @@ BASE_IMAGE=${BASE}server:${TAG} if [ "$TAG" != "latest" ]; then + export BASE="cattle/" TAG= $0 "$@" fi
bash
d_bash_23244
--- +++ @@ -2,8 +2,6 @@ rm -rf autom4te.cache rm -f aclocal.m4 ltmain.sh - -mkdir m4 touch README
bash
d_bash_23245
--- +++ @@ -11,7 +11,7 @@ # Build cd $GOPATH/src/github.com/terraform-providers/$PKG_NAME make build -make test +#make test # Install Binary into PREFIX/bin mv $GOPATH/bin/$PKG_NAME $PREFIX/bin/${PKG_NAME}_v${PKG_VERSION}_x4
bash
d_bash_23246
--- +++ @@ -17,5 +17,6 @@ alias sf='php app/console' alias sfcl='php app/console cache:clear' alias sfroute='php app/console router:debug' +alias sfcontainer='php app/console container:debug' alias sfgb='php app/console generate:bundle'
bash
d_bash_23247
--- +++ @@ -3,4 +3,4 @@ cd ${SCRIPT_DIR} export NODE_ENV=development -gulp +gulp $1
bash
d_bash_23248
--- +++ @@ -8,3 +8,7 @@ do echo "<li><a href=\"/downloads/iso/windows/${FILE}\">${FILE}</a></li>" done +for FILE in $(ls downloads/OpenBSD) +do + echo "<li><a href=\"/downloads/iso/OpenBSD/${FILE}\">${FILE}</a></li>" +done
bash
d_bash_23249
--- +++ @@ -1,6 +1,6 @@ #!/usr/bin/env sh -make dark/_gor4.so +# make dark/_gor4.so pip install -r requirements.txt
bash
d_bash_23250
--- +++ @@ -20,7 +20,7 @@ echo "Running goimports..." go get code.google.com/p/go.tools/cmd/goimports -$GOPATH/bin/goimports -w . +goimports -w . echo "Running go fmt..." go fmt ./...
bash
d_bash_23251
--- +++ @@ -8,13 +8,14 @@ echo "==> Installing VirtualBox guest additions" VER=$(cat "$SSH_USER_HOME"/.vbox_version) ISO="VBoxGuestAdditions_$VER.iso"; - mkdir -p /tmp/vbox; - mount -o loop" $SSH_USER_HOME/$ISO" /tmp/vbox; - sh /tmp/vbox/VBoxLinuxAdditions.run \ + MOUNT_PATH="/tmp/vbox" + ...
bash
d_bash_23252
--- +++ @@ -4,4 +4,10 @@ [[ -f /etc/hhvm/php.ini ]] && cat /etc/hhvm/php.ini [[ -f /etc/hhvm/config.hdf ]] && cat /etc/hhvm/config.hdf +if [[ -d /var/lib/php5 ]]; then + ls -ld /var/lib/php5 +else + echo Default session storage directory not found. +fi + hhvm ${HHVM_FLAGS} --php vendor/phpunit/phpunit/phpunit
bash
d_bash_23253
--- +++ @@ -2,7 +2,7 @@ describe "cli: tests around boom the binary — help, version, and so on" -boom="./bin/boom" +boom="JSON=test/examples/urls.json ./bin/boom" it_shows_help() { $boom help | grep "boom: help"
bash
d_bash_23254
--- +++ @@ -1,14 +1,14 @@ #!/usr/bin/env bash + +npm_bin=$(which npm) +if [[ -z "$npm_bin" ]]; then + echo "NPM must be on the path. (https://www.npmjs.com/)" + exit 1 +fi wct_bin=$(which wct) if [[ -z "$wct_bin" ]]; then - echo "WCT must be on the path." - exit 1 -fi - -npm_bin=$(which npm) -if [[ -...
bash
d_bash_23255
--- +++ @@ -1,18 +1,4 @@ #!/bin/bash source /var/vcap/jobs/rabbitmq-server/lib/delete_old_files.bash - -main() { - delete_all_legacy_http_log_files - delete_http_log_files -} - -delete_all_legacy_http_log_files() { - rm -f /var/vcap/sys/log/rabbitmq-server/access.log* -} - -delete_http_log_files() { - delete_...
bash
d_bash_23256
--- +++ @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2014 Michael Scherer <mscherer@redhat.com> +# Copyright (c) 2014-2016 Michael Scherer <mscherer@redhat.com> # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"...
bash
d_bash_23257
--- +++ @@ -1,12 +1,13 @@ #!/usr/bin/env bash -if [[ $TRAVIS_PULL_REQUEST == false && ($TRAVIS_BRANCH == $TRAVIS_TAG || $TRAVIS_BRANCH == "master") ]] +if [[ $TRAVIS_PULL_REQUEST == false && ($TRAVIS_BRANCH == $TRAVIS_TAG || $TRAVIS_BRANCH == "master" || $TRAVIS_BRANCH == "javadox") ]] then - mvn -nsu -B javadoc...
bash
d_bash_23258
--- +++ @@ -12,14 +12,14 @@ ensure_import_testimage for i in `seq 5`; do - lxc init testimage leaktest1 - lxc info leaktest1 + lxc init testimage leaktest${i} + lxc info leaktest${i} if [ -z "${TRAVIS_PULL_REQUEST:-}" ]; then - lxc start leaktest1 - lxc exec leakte...
bash
d_bash_23259
--- +++ @@ -14,6 +14,8 @@ REPO_DIR="$(dirname "$SCRIPT_DIR")" EXP_DIR="${PROJECT_DIR}/$EXP" ANALYSIS_DIR="${EXP_DIR}/${USER}${ANALYSIS_NUM}" +KERNEL_SOURCE="${SCRIPT_DIR}/notebooks/kernels/metatlas-targeted.kernel.json" +KERNEL_DESTINATION="${HOME}/.local/share/jupyter/kernels/metatlas-targeted/kernel.json" IFS...
bash
d_bash_23260
--- +++ @@ -13,11 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -GIT_DATE="$(grep -s GIT_DATE bazel-out/volatile-status.txt | cut -f2 -d' ')" -GIT_DESC="$(grep -s GIT_DESCRIBE bazel-out/volatile-status.txt | cut -f2 -d' ')" +# The file where bazel...
bash
d_bash_23261
--- +++ @@ -7,6 +7,10 @@ PLATFORMS="darwin linux windows" rm -rf releases/ && mkdir releases for PLATFORM in $PLATFORMS; do - CGO_ENABLED=0 GOOS=${PLATFORM} go build -a -tags netgo -installsuffix netgo -ldflags "$GO_LDFLAGS" -o "$BIN_NAME" && zip "releases/${BIN_NAME}-${PLATFORM}-amd64.zip" "$BIN_NAME" && rm "$BI...
bash
d_bash_23262
--- +++ @@ -19,7 +19,7 @@ echo "Commits since $lastTag to $thisTag" echo -git log $lastTag..HEAD --oneline --pretty=format:'%C(green)%h%C(reset) %<(12)%C(blue)%cr%C(reset)% C(red)%D%C(reset)% C(cyan)%s%C(reset)' --abbrev-commit +git log $lastTag..HEAD --oneline --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Crese...
bash
d_bash_23263
--- +++ @@ -1,4 +1,8 @@ #!/usr/bin/env bash + +export SLACK_USERNAME="Vagrant Cloud RubyGem" +export SLACK_ICON="https://avatars.slack-edge.com/2017-10-17/257000837696_070f98107cdacc0486f6_36.png" +export SLACK_TITLE="💎 RubyGems Publishing" csource="${BASH_SOURCE[0]}" while [ -h "$csource" ] ; do csource="$(rea...
bash
d_bash_23264
--- +++ @@ -28,4 +28,4 @@ return $? } -complete -o default -o nospace -F __npm_completion npm +complete -o default -F __npm_completion npm
bash
d_bash_23265
--- +++ @@ -2,7 +2,7 @@ set -e JDK_FEATURE=10 -JDK_BUILD=31 +JDK_BUILD=32 JDK_ARCHIVE=jdk-${JDK_FEATURE}-ea+${JDK_BUILD}_linux-x64_bin.tar.gz cd ~
bash
d_bash_23266
--- +++ @@ -15,9 +15,8 @@ THIS=$( dirname $0 ) # Rajeev -$THIS/p1b1_mlrMBO/test/test-1.sh $SITE # Theta only - -$THIS/p3b1_mlrMBO/test/test-1.sh $SITE # WORKS: Cori, Titan -$THIS/nt3_mlrMBO/test/test-1.sh $SITE # WORKS: Theta only +$THIS/p1b1_mlrMBO/test/test-1.sh $SITE # Theta((RJ*)) Titan((RJ)) +$THIS/p3b1_mlrM...
bash
d_bash_23267
--- +++ @@ -35,5 +35,6 @@ rm $TMP grep default_ web2py/routes.py -# Kludge in case OPENTREE_DEFAULT_APPLICATION is set to 'welcome' +# Kludge in case OPENTREE_DEFAULT_APPLICATION is set to 'welcome' or (more likely) 'phylesystem' cp -p repo/opentree/webapp/static/robots.txt web2py/applications/welcome/static/ +c...
bash
d_bash_23268
--- +++ @@ -8,16 +8,16 @@ echo '# vNEXT // FIXME' echo - git log --first-parent "${LAST}.." | grep -A4 '^Date:' | sed -r \ + git log --first-parent "${LAST}.." | grep -A4 '^Date:' | sed \ -e '/^ *$/d' \ -e '/Merge pull request/d' \ -e '/^Date:/d' \ -e '/^--/d' \ ...
bash
d_bash_23269
--- +++ @@ -16,6 +16,7 @@ echo "Installing python packages..." pip2 install --user neovim +pip install beets if [ -x $CONFIGS_DIR/python_local.sh ]; then $CONFIGS_DIR/python_local.sh
bash
d_bash_23270
--- +++ @@ -1,8 +1,13 @@ #!/bin/sh + +# All git ignored files: git ls-files --others -i --exclude-standard git clean -df git checkout app_prototype/config/routes.rb app_prototype/db/schema.rb +find . -name ".DS_Store" -exec rm -f {} \; + +rm -rfv app_prototype/.DS_Store rm -rfv app_prototype/log/* rm -rfv ap...
bash
d_bash_23271
--- +++ @@ -1,10 +1,17 @@ #!/bin/sh stow --version >/dev/null 2>&1 -if [ $? -gt 0 ] -then - echo 'GNU Stow must be installed...' - exit 127 +if [ $? -gt 0 ]; then + if [[ "$OSTYPE" == "linux-gnu" ]]; then + sudo apt update + sudo apt install stow + elif [[ "$OSTYPE" == "darwin"* ]]; then + ...
bash
d_bash_23272
--- +++ @@ -1,10 +1,12 @@ # git bash completion if [ -f /etc/bash_completion.d/git ]; then - . /etc/bash_completion.d/git - __git_complete gch _git_checkout + . /etc/bash_completion.d/git + __git_complete gch _git_checkout elif [ -f ~/.git-completion.bash ]; then - . ~/.git-completion.bash - __git...
bash
d_bash_23273
--- +++ @@ -30,7 +30,7 @@ rm -rf tmp-lcov tmp # coveralls may pick it up and lie about our coverage -echo "extension=phongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` +echo "extension=mongodb.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` MONGO=`which mongo`...
bash
d_bash_23274
--- +++ @@ -24,6 +24,9 @@ export PATH="test/runner:${PATH}" reorganize-tests.sh # temporary solution until repositories are merged +# remove empty core/extras module directories from PRs created prior to the repo-merge +find lib/ansible/modules -type d -empty -print -delete + function cleanup { if [ "$(ls ...
bash
d_bash_23275
--- +++ @@ -1,5 +1,5 @@ #!/bin/bash -if [ ! -d ~/.meteor ]; then +if [ ! -f ~/.meteor/meteor ]; then curl https://install.meteor.com | /bin/sh fi
bash
d_bash_23276
--- +++ @@ -5,10 +5,10 @@ mkdir build cd build if command -v ninja; then - cmake .. -GNinja + cmake .. -GNinja -DCMAKE_BUILD_TYPE=Debug ninja else - cmake .. + cmake .. -DCMAKE_BUILD_TYPE=Debug make fi src/mytest
bash
d_bash_23277
--- +++ @@ -8,8 +8,8 @@ umount /mnt # Unmount all aufs mounts - mounts=$(cat /proc/mounts | grep /var/vcap/data/garden/aufs_graph/aufs/mnt | awk '{print $2}') - [[ -n "${mounts}" ]] && echo ${mounts} | xargs umount + mounts=$(grep /var/vcap/data/garden/aufs_graph/aufs/mnt /proc/mounts | awk '{pri...
bash
d_bash_23278
--- +++ @@ -20,7 +20,7 @@ atom/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm install autocomplete-plus echo "Downloading package dependencies..." -atom/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm update +atom/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm install echo "Lint...
bash
d_bash_23279
--- +++ @@ -16,16 +16,14 @@ done if [ -d "${CONTAINER_NAME}" ]; then LEGACY_ID=$(docker images | grep $CONTAINER_NAME | awk '{print $3}') + if [[ ! -z "$LEGACY_ID" ]]; then + echo "Delete existing image ${LEGACY_ID} - ${CONTAINER_NAME}" + docker rmi -f ${CONTAINER_NAME} || true + ...
bash
d_bash_23280
--- +++ @@ -5,8 +5,8 @@ GCCVERSION_MAJOR=$(echo $GCCVERSION | awk 'BEGIN {FS="."}; {print $1}') GCCVERSION_MINOR=$(echo $GCCVERSION | awk 'BEGIN {FS="."}; {print $2}') -if [ $GCCVERSION_MAJOR <= 4 ]; then - if [ $GCCVERSION_MINOR <= 5 ]; then +if [ $GCCVERSION_MAJOR -le 4 ]; then + if [ $GCCVERSION_MINOR -l...
bash
d_bash_23281
--- +++ @@ -22,7 +22,7 @@ cd "${WORKSPACE}" # Let clang format apply patches --diff doesn't produces results in the format we want. -git-clang-format --style=llvm +git-clang-format set +e git diff -U0 --exit-code > "${TARGET_DIR}"/clang-format.patch STATUS="${PIPESTATUS[0]}"
bash
d_bash_23282
--- +++ @@ -10,7 +10,7 @@ ruby scripts/copy-staging-to-release-repo.rb -mvn org.sonatype.plugins:nexus-maven-plugin:staging-close \ +mvn org.sonatype.plugins:nexus-maven-plugin:2.0.6:staging-close \ --batch-mode \ --errors \ -Dnexus.url=https://oss.sonatype.org/ \
bash
d_bash_23283
--- +++ @@ -12,7 +12,7 @@ # Math::MatrixReal, for prinseq-graph aptitude -y --without-recommends install libjson-perl libcairo-perl libtext-simpletable-perl libcontextual-return-perl libwant-perl cpanminus #cpanm Contextual::Return Exception::Class Test::{Warn,Exception,Differences,Deep} Math::Cephes Math::MatrixR...
bash
d_bash_23284
--- +++ @@ -15,7 +15,14 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. if test -z "$LIBTOOLIZE" -a "`uname`" = "Darwin"; then - LIBTOOLIZE=glibtoolize + if command -v "glibtoolize" >/dev/null; then + LIBTOOLIZE=glibtoolize + elif command -v "libtoolize" >/dev/null; then + LIBTOOLIZE=libtoo...
bash
d_bash_23285
--- +++ @@ -2,7 +2,7 @@ git pull cd ../repo-tools source venv/bin/activate -python monthly_pr_stats.py +python monthly_pr_stats.py --start=6/1/2015 python pull_quarters.py --monthly --start=6/1/2015 python transitions_kpi.py --all --since=30 python pull_orgs.py --since=31 --short
bash
d_bash_23286
--- +++ @@ -7,6 +7,7 @@ cd /home/deploy/BitToll git checkout master git pull origin +git fetch --tags git checkout $(git tag -l v\* | sort -V | tail -1) sudo /home/deploy/BitToll/production/run_puppet.sh "
bash
d_bash_23287
--- +++ @@ -14,10 +14,12 @@ clone() { name=$1 url=$2 + branch=$3 if [[ ! -e $name ]] then echo "Cloning the latest version of $name" git clone -q $url + git checkout $branch if [[ -e $name/CMakeLists.txt ]] then @@ -33,5 +35,5 @@ } cd ~/repos -c...
bash
d_bash_23288
--- +++ @@ -9,7 +9,8 @@ cargo build -p collector; RUST_BACKTRACE=1 RUST_LOG=collector=trace,rust_sysroot=debug \ cargo run -p collector --bin collector -- \ - --output-repo rustc-timing --exclude servo,cargo,crates.io test_benchmarks; + --output-repo rustc-timing \ + --exclude servo,cargo,crates.io,pa...
bash
d_bash_23289
--- +++ @@ -22,14 +22,15 @@ pushd $directory -if [ ! -f configure.done ] -then - CFLAGS=-I/include\ -L/lib\ -Os ./configure --prefix= +#if [ ! -f configure.done ] +#then +# CFLAGS=-I/include\ -L/lib\ -Os ./configure --prefix= +# +# echo done > configure.done +#fi - echo done > configure.done -fi - ...
bash
d_bash_23290
--- +++ @@ -10,6 +10,6 @@ echo "$file is missing license header." ERROR_COUNT+=1 fi -done < <(git grep -l "" | grep "\.go") +done < <(git ls-files "\.go") exit $ERROR_COUNT
bash
d_bash_23291
--- +++ @@ -4,7 +4,7 @@ VERSION=`cat "VERSION"` zip -9 -r -n pyc -o files/${NAME}-${VERSION}.oxt \ - META-INF/* *.xcu *.xcs *.py description.xml MRILib/* \ + META-INF/* *.xcu *.xcs MRI.py description.xml MRILib/* \ descriptions/* dialogs/* help/* icons/* \ notices/* web/* pythonpath/mytools_Mri/*.py \ pytho...
bash
d_bash_23292
--- +++ @@ -9,3 +9,6 @@ git config --global core.excludesfile $HOME/.gitignore git config --global push.default simple git config --global fetch.prune true + +# Three ways diff, so we have the common text +git config --global merge.conflict diff3
bash
d_bash_23293
--- +++ @@ -4,7 +4,7 @@ function _jd() { if [[ ${COMP_WORDS[COMP_CWORD]} != -* ]] ; then - COMPREPLY=( `jd.py 5 ${COMP_WORDS[COMP_CWORD]}` ) + COMPREPLY=( `jd.py ${JD_DEPTH:=5} ${COMP_WORDS[COMP_CWORD]}` ) return 0 fi }
bash
d_bash_23294
--- +++ @@ -5,4 +5,4 @@ cd NJOY2016 sed -i -e 's/5\.1/4.8/' CMakeLists.txt mkdir build && cd build -cmake .. && make 2>/dev/null && sudo make install +cmake -Dstatic=on .. && make 2>/dev/null && sudo make install
bash
d_bash_23295
--- +++ @@ -3,7 +3,7 @@ MOUNT_GROUP_ID=$(stat -c "%g" .) MOUNT_GROUP_EXISTS=$(grep "^$MOUNT_GROUP:" /etc/group | wc -l) -if [ "$MOUNT_GROUP" -ne "apache" ]; then +if [ "$MOUNT_GROUP" != "apache" ]; then groupadd -f -g $MOUNT_GROUP_ID $MOUNT_GROUP; usermod -a -G "$MOUNT_GROUP" apache; fi
bash
d_bash_23296
--- +++ @@ -13,6 +13,8 @@ echo "========== Logging output from containers ==========" /usr/local/bin/docker-compose logs +echo "========== Logging output from syslog ==========" +cat ../logs/requisition/messages echo "========== Logging nginx settings ==========" /usr/local/bin/docker-compose exec nginx cat /et...
bash
d_bash_23297
--- +++ @@ -16,5 +16,13 @@ -DgroupId=io.piazzageo \ -Dpackaging=$EXT \ -Dtransitive=false \ - -Ddestination=$root/app.$EXT \ -Dversion=$SHORT + +mvn dependency:copy \ + -DgroupId=core \ + -DartifactId=$APP \ + -Dversion=$SHORT \ + -Dtype=$EXT \ + -DoverWrite=true \ + -DoutputDirectory=$root \ + -D...
bash
d_bash_23298
--- +++ @@ -10,6 +10,6 @@ xidlehook \ --not-when-fullscreen \ --not-when-audio \ - --timer normal 180 'xrandr --output "$PRIMARY_DISPLAY" --brightness .1' 'xrandr --output "$PRIMARY_DISPLAY" --brightness 1' \ - --timer normal 600 'systemctl suspend' '' + --timer normal 120 'xrandr --output "$PRIMA...
bash
d_bash_23299
--- +++ @@ -25,7 +25,7 @@ # deploy # deploy your site via S3, Rsync, or to GitHub pages. # Jekyll -alias serve='bundle exec jekyll serve' +alias serve='export $(cat .env | xargs) && bundle exec jekyll serve' alias servedraft='serve --draft' alias served='serve --detach' alias servedraftd='servedra...
bash