Skip to content

Commit 2ae8ad9

Browse files
committed
Merge upstream/main
1 parent 7ada276 commit 2ae8ad9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1488
-408
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ Read Contributing Guidelines before opening a PR.
55
https://github.com/ChrisTitusTech/linutil/blob/main/.github/CONTRIBUTING.md
66
-->
77

8-
## Title
9-
<!--[Provide a succinct and descriptive title for the pull request.]-->
10-
118
## Type of Change
129
- [ ] New feature
1310
- [ ] Bug fix

.github/workflows/bashisms.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Check for bashisms
2+
3+
on:
4+
push:
5+
paths:
6+
- tabs/**
7+
branches: [ "main" ]
8+
pull_request:
9+
paths:
10+
- tabs/**
11+
merge_group:
12+
workflow_dispatch:
13+
14+
jobs:
15+
check-bashisms:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- name: Install devscripts
22+
run: sudo apt install devscripts
23+
24+
- name: Concatenate all .sh files and check for bashisms
25+
working-directory: tabs
26+
run: |
27+
find . -name '*.sh' -exec checkbashisms {} + > all_scripts.sh

.github/workflows/pr-labels.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/rust.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ name: Rust Checks
33
on:
44
pull_request:
55
branches: ["main"]
6+
paths:
7+
- '**/*.rs'
8+
- 'Cargo.toml'
9+
- 'Cargo.lock'
610

711
env:
812
CARGO_TERM_COLOR: always

start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/sh -e
22

33
rc='\033[0m'
44
red='\033[0;31m'

startdev.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/sh -e
22

33
RC='\033[0m'
44
RED='\033[0;31m'
@@ -35,7 +35,7 @@ check() {
3535
local message=$2
3636

3737
if [ $exit_code -ne 0 ]; then
38-
echo -e "${RED}ERROR: $message${RC}"
38+
printf "%b\n" "${RED}ERROR: $message${RC}"
3939
exit 1
4040
fi
4141
}

tabs/applications-setup/alacritty-setup.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,34 @@
22

33
. ../common-script.sh
44

5-
setupAlacritty() {
6-
echo "Install Alacritty if not already installed..."
5+
installAlacritty() {
6+
printf "%b\n" "${YELLOW}Installing Alacritty...${RC}"
77
if ! command_exists alacritty; then
8-
case ${PACKAGER} in
8+
case "$PACKAGER" in
99
pacman)
10-
$ESCALATION_TOOL ${PACKAGER} -S --needed --noconfirm alacritty
10+
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm alacritty
1111
;;
1212
*)
13-
$ESCALATION_TOOL ${PACKAGER} install -y alacritty
13+
$ESCALATION_TOOL "$PACKAGER" install -y alacritty
1414
;;
1515
esac
1616
else
17-
echo "alacritty is already installed."
17+
printf "%b\n" "${GREEN}Alacritty is already installed.${RC}"
1818
fi
1919
}
2020

2121
setupAlacrittyConfig() {
22-
echo "Copy alacritty config files"
22+
printf "%b\n" "${YELLOW}Copy alacritty config files${RC}"
2323
if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then
2424
cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak"
2525
fi
2626
mkdir -p "${HOME}/.config/alacritty/"
2727
curl -sSLo "${HOME}/.config/alacritty/alacritty.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/alacritty.toml"
2828
curl -sSLo "${HOME}/.config/alacritty/nordic.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/nordic.toml"
29+
printf "%b\n" "${GREEN}Alacritty configuration files copied.${RC}"
2930
}
3031

3132
checkEnv
3233
checkEscalationTool
33-
setupAlacritty
34+
installAlacritty
3435
setupAlacrittyConfig

0 commit comments

Comments
 (0)