Skip to content

Commit fd55b55

Browse files
committed
Sync boilerplate.
* install.sh: drop quotes around apt packages. * Makefile: fail make tag if dev tools not installed. * tox.ini: update ruff invocation to avoid deprecation warning. * install.sh: drop quotes around apt packages. * install.sh: drop symlink warning for /boot/config.txt.
1 parent 9bddfec commit fd55b55

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ endif
2222
@echo "deploy: build and upload to PyPi"
2323
@echo "tag: tag the repository with the current version\n"
2424

25+
version:
26+
@hatch version
27+
2528
install:
2629
./install.sh --unstable
2730

@@ -47,7 +50,7 @@ pytest:
4750
nopost:
4851
@bash check.sh --nopost
4952

50-
tag:
53+
tag: version
5154
git tag -a "v${LIBRARY_VERSION}" -m "Version ${LIBRARY_VERSION}"
5255

5356
build: check

install.sh

+2-6
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ find_config() {
5858
if [ ! -f "$CONFIG_DIR/$CONFIG_FILE" ]; then
5959
fatal "Could not find $CONFIG_FILE!"
6060
fi
61-
else
62-
if [ -f "/boot/$CONFIG_FILE" ] && [ ! -L "/boot/$CONFIG_FILE" ]; then
63-
warning "Oops! It looks like /boot/$CONFIG_FILE is not a link to $CONFIG_DIR/$CONFIG_FILE"
64-
warning "You might want to fix this!"
65-
fi
6661
fi
6762
inform "Using $CONFIG_FILE in $CONFIG_DIR"
6863
}
@@ -156,7 +151,8 @@ function apt_pkg_install {
156151
sudo apt update
157152
APT_HAS_UPDATED=true
158153
fi
159-
sudo apt install -y "$PACKAGES"
154+
# shellcheck disable=SC2086
155+
sudo apt install -y $PACKAGES
160156
check_for_error
161157
if [ -f "$UNINSTALLER" ]; then
162158
echo "apt uninstall -y $PACKAGES" >> "$UNINSTALLER"

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ commands =
2020
python -m build --no-isolation
2121
python -m twine check dist/*
2222
isort --check .
23-
ruff .
23+
ruff check .
2424
codespell .
2525
deps =
2626
check-manifest

0 commit comments

Comments
 (0)