mirror of
https://github.com/ankitects/anki.git
synced 2025-09-19 06:22:22 -04:00
Added -o pipefail to all set -e ensuring the build fails when some
operation with pipe exits error status. # Conflicts: # Makefile
This commit is contained in:
parent
c171104a81
commit
47ccd6638d
8 changed files with 12 additions and 12 deletions
2
.github/scripts/contrib.sh
vendored
2
.github/scripts/contrib.sh
vendored
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -e
|
set -eo pipefail
|
||||||
|
|
||||||
antispam=", at the domain "
|
antispam=", at the domain "
|
||||||
|
|
||||||
|
|
10
Makefile
10
Makefile
|
@ -34,7 +34,7 @@ buildhash:
|
||||||
|
|
||||||
.PHONY: develop
|
.PHONY: develop
|
||||||
develop: pyenv buildhash
|
develop: pyenv buildhash
|
||||||
@set -e && \
|
@set -eo pipefail && \
|
||||||
. pyenv/bin/activate && \
|
. pyenv/bin/activate && \
|
||||||
for dir in $(DEVEL); do \
|
for dir in $(DEVEL); do \
|
||||||
$(SUBMAKE) -C $$dir develop BUILDFLAGS="$(BUILDFLAGS)"; \
|
$(SUBMAKE) -C $$dir develop BUILDFLAGS="$(BUILDFLAGS)"; \
|
||||||
|
@ -42,7 +42,7 @@ develop: pyenv buildhash
|
||||||
|
|
||||||
.PHONY: run
|
.PHONY: run
|
||||||
run: develop
|
run: develop
|
||||||
@set -e && \
|
@set -eo pipefail && \
|
||||||
. pyenv/bin/activate && \
|
. pyenv/bin/activate && \
|
||||||
echo "Starting Anki..."; \
|
echo "Starting Anki..."; \
|
||||||
qt/runanki $(RUNFLAGS)
|
qt/runanki $(RUNFLAGS)
|
||||||
|
@ -69,7 +69,7 @@ build-qt:
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean: clean-dist
|
clean: clean-dist
|
||||||
@set -e && \
|
@set -eo pipefail && \
|
||||||
for dir in $(DEVEL); do \
|
for dir in $(DEVEL); do \
|
||||||
$(SUBMAKE) -C $$dir clean; \
|
$(SUBMAKE) -C $$dir clean; \
|
||||||
done
|
done
|
||||||
|
@ -80,7 +80,7 @@ clean-dist:
|
||||||
|
|
||||||
.PHONY: check
|
.PHONY: check
|
||||||
check: pyenv buildhash
|
check: pyenv buildhash
|
||||||
@set -e && \
|
@set -eo pipefail && \
|
||||||
for dir in $(CHECKABLE_RS); do \
|
for dir in $(CHECKABLE_RS); do \
|
||||||
$(SUBMAKE) -C $$dir check; \
|
$(SUBMAKE) -C $$dir check; \
|
||||||
done; \
|
done; \
|
||||||
|
@ -95,7 +95,7 @@ check: pyenv buildhash
|
||||||
|
|
||||||
.PHONY: fix
|
.PHONY: fix
|
||||||
fix:
|
fix:
|
||||||
@set -e && \
|
@set -eo pipefail && \
|
||||||
. pyenv/bin/activate && \
|
. pyenv/bin/activate && \
|
||||||
for dir in $(CHECKABLE_RS) $(CHECKABLE_PY); do \
|
for dir in $(CHECKABLE_RS) $(CHECKABLE_PY); do \
|
||||||
$(SUBMAKE) -C $$dir fix; \
|
$(SUBMAKE) -C $$dir fix; \
|
||||||
|
|
|
@ -104,7 +104,7 @@ You can do this automatically by adding the following into
|
||||||
.git/hooks/pre-commit or .git/hooks/pre-push and making it executable.
|
.git/hooks/pre-commit or .git/hooks/pre-push and making it executable.
|
||||||
|
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -eo pipefail
|
||||||
make check
|
make check
|
||||||
|
|
||||||
You may need to adjust the PATH variable so that things like a local install
|
You may need to adjust the PATH variable so that things like a local install
|
||||||
|
|
|
@ -14,5 +14,5 @@ do
|
||||||
perl -pe "s%po/desktop/(.*)/anki.po%$targetDir/\1/LC_MESSAGES%")
|
perl -pe "s%po/desktop/(.*)/anki.po%$targetDir/\1/LC_MESSAGES%")
|
||||||
outfile="$outdir/anki.mo"
|
outfile="$outdir/anki.mo"
|
||||||
mkdir -p $outdir
|
mkdir -p $outdir
|
||||||
msgmerge --for-msgfmt "$file" po/desktop/anki.pot | msgfmt - --output-file=$outfile
|
msgmerge --for-msgfmt "$file" po/desktop/anki.pot | msgfmt - --output-file="$outfile"
|
||||||
done
|
done
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -e
|
set -eo pipefail
|
||||||
|
|
||||||
out=../aqt_data/locale/qt
|
out=../aqt_data/locale/qt
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -eo pipefail
|
||||||
|
|
||||||
# pull any pending changes from git repos
|
# pull any pending changes from git repos
|
||||||
./pull-git
|
./pull-git
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# update template .pot file from source code strings
|
# update template .pot file from source code strings
|
||||||
#
|
#
|
||||||
set -e
|
set -eo pipefail
|
||||||
|
|
||||||
topDir=$(dirname $0)/../..
|
topDir=$(dirname $0)/../..
|
||||||
cd $topDir
|
cd $topDir
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# should be on the path.
|
# should be on the path.
|
||||||
#
|
#
|
||||||
|
|
||||||
set -e
|
set -eo pipefail
|
||||||
|
|
||||||
if [ ! -d "designer" ]
|
if [ ! -d "designer" ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in a new issue