Skip to content

Commit fc0eea1

Browse files
staniostanio
committed
Build the left-handed variants only when requested
1 parent c156faa commit fc0eea1

5 files changed

Lines changed: 68 additions & 26 deletions

File tree

‎.github/workflows/mousegen.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ on:
2626
description: Mousecape cursors
2727
type: boolean
2828
default: true
29+
leftHanded:
30+
description: Build left-handed cursors, also
31+
type: boolean
2932
zopfliPNG:
3033
description: Zopfli PNG (veery slow)
3134
type: boolean
@@ -36,6 +39,7 @@ jobs:
3639
env:
3740
VERSION: ${{ inputs.version }}
3841
MOUSE_COLORS: ${{ inputs.colors }}
42+
MOUSE_LEFTHAND: ${{ inputs.leftHanded }}
3943
MOUSEGEN_OPTS: -Dwincur.PNGEncoder=${{ inputs.zopfliPNG && 'zopfli' || '' }}
4044

4145
steps:

‎bin/mousegen-capes‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,29 @@ set -e
3333
modernName='Modern-${color}-${size}-${outline}-${shadow}'
3434
originalName='Original-${color}-${size}-${outline}-${shadow}'
3535

36+
leftHandedModern=
37+
leftHandedOriginal=
38+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
39+
leftHandedModern="--source svg/modern-right --name \${shadow:NoShadow}/Bibata-Left-handed-$modernName"
40+
leftHandedOriginal="--source svg/original-right --name \${shadow:NoShadow}/Bibata-Left-handed-$originalName"
41+
fi
42+
3643
mousegenRender --source svg/modern --name "\${shadow:NoShadow}/Bibata-$modernName" \
3744
--source svg/original --name "\${shadow:NoShadow}/Bibata-$originalName" \
38-
--source svg/modern-right --name "\${shadow:NoShadow}/Bibata-Left-handed-$modernName" \
39-
--source svg/original-right --name "\${shadow:NoShadow}/Bibata-Left-handed-$originalName" \
45+
$leftHandedModern $leftHandedOriginal \
4046
--all-variants "$@"
4147

4248
echo
4349
echo "=== Thinner strokes with expanded fill"
4450
echo
4551
mousegenRender --mousecape-theme=mac-names-efill-modern.json \
4652
--source svg/modern --name "\${shadow:NoShadow}/Bibata-$modernName" \
47-
--source svg/modern-right --name "\${shadow:NoShadow}/Bibata-Left-handed-$modernName" \
53+
$leftHandedModern \
4854
--expand-fill=4 --update-existing "$@"
4955
echo
5056
mousegenRender --mousecape-theme=mac-names-efill-original.json \
5157
--source svg/original --name "\${shadow:NoShadow}/Bibata-$originalName" \
52-
--source svg/original-right --name "\${shadow:NoShadow}/Bibata-Left-handed-$originalName" \
58+
$leftHandedOriginal \
5359
--expand-fill=4 --update-existing "$@"
5460

5561
echo
@@ -65,7 +71,9 @@ for color in $MOUSE_COLORS; do
6571
if [ -z "$pkgName" ]; then continue; fi
6672
echo "Bibata-Mousecape-$pkgName-v$VERSION.zip"
6773
jar cMf ../Bibata-Mousecape-$pkgName-v$VERSION.zip COPYING */Bibata-[MO]*-$dirName*.cape
68-
echo "Bibata-Mousecape-Left-handed-$pkgName-v$VERSION.zip"
69-
jar cMf ../Bibata-Mousecape-Left-handed-$pkgName-v$VERSION.zip COPYING */Bibata-Left*-$dirName*.cape
74+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
75+
echo "Bibata-Mousecape-Left-handed-$pkgName-v$VERSION.zip"
76+
jar cMf ../Bibata-Mousecape-Left-handed-$pkgName-v$VERSION.zip COPYING */Bibata-Left*-$dirName*.cape
77+
fi
7078
done
7179
echo done.

‎bin/mousegen-kscalable‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,29 @@ set -e
3232
modernName='Modern-${color}-${size}-${outline}-${shadow}'
3333
originalName='Original-${color}-${size}-${outline}-${shadow}'
3434

35+
leftHandedModern=
36+
leftHandedOriginal=
37+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
38+
leftHandedModern="--source svg/modern-right --name \${shadow:Shadow}/Bibata-Left-handed-$modernName"
39+
leftHandedOriginal="--source svg/original-right --name \${shadow:Shadow}/Bibata-Left-handed-$originalName"
40+
fi
41+
3542
mousegenRender --source svg/modern --name "\${shadow:Shadow}/Bibata-$modernName" \
3643
--source svg/original --name "\${shadow:Shadow}/Bibata-$originalName" \
37-
--source svg/modern-right --name "\${shadow:Shadow}/Bibata-Left-handed-$modernName" \
38-
--source svg/original-right --name "\${shadow:Shadow}/Bibata-Left-handed-$originalName" \
44+
$leftHandedModern $leftHandedOriginal \
3945
--all-variants "$@"
4046

4147
echo
4248
echo "=== Thinner strokes with expanded fill"
4349
echo
4450
mousegenRender --scalable-cursors=x11-names-efill-modern.json \
4551
--source svg/modern --name "\${shadow:Shadow}/Bibata-$modernName" \
46-
--source svg/modern-right --name "\${shadow:Shadow}/Bibata-Left-handed-$modernName" \
52+
$leftHandedModern \
4753
--expand-fill=4 "$@"
4854
echo
4955
mousegenRender --scalable-cursors=x11-names-efill-original.json \
5056
--source svg/original --name "\${shadow:Shadow}/Bibata-$originalName" \
51-
--source svg/original-right --name "\${shadow:Shadow}/Bibata-Left-handed-$originalName" \
57+
$leftHandedOriginal \
5258
--expand-fill=4 "$@"
5359

5460
#echo

‎bin/mousegen-windows‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,41 @@ set -e
3535
modernName='Modern-${color}-${size}-${outline}-${shadow}'
3636
originalName='Original-${color}-${size}-${outline}-${shadow}'
3737

38+
leftHandedModern=
39+
leftHandedOriginal=
40+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
41+
leftHandedModern="--source svg/modern-right --name \${shadow:NoShadow}/Left-handed-$modernName"
42+
leftHandedOriginal="--source svg/original-right --name \${shadow:NoShadow}/Left-handed-$originalName"
43+
fi
44+
3845
mousegenRender --source svg/modern --name "\${shadow:NoShadow}/$modernName" \
3946
--source svg/original --name "\${shadow:NoShadow}/$originalName" \
40-
--source svg/modern-right --name "\${shadow:NoShadow}/Left-handed-$modernName" \
41-
--source svg/original-right --name "\${shadow:NoShadow}/Left-handed-$originalName" \
47+
$leftHandedModern $leftHandedOriginal \
4248
--all-variants "$@"
4349

4450
echo
4551
echo "=== Thinner strokes with expanded fill"
4652
echo
4753
mousegenRender --windows-cursors=win-names-efill-modern.json \
4854
--source svg/modern --name "\${shadow:NoShadow}/$modernName" \
49-
--source svg/modern-right --name "\${shadow:NoShadow}/Left-handed-$modernName" \
55+
$leftHandedModern \
5056
--expand-fill=4 "$@"
5157
echo
5258
mousegenRender --windows-cursors=win-names-efill-original.json \
5359
--source svg/original --name "\${shadow:NoShadow}/$originalName" \
54-
--source svg/original-right --name "\${shadow:NoShadow}/Left-handed-$originalName" \
60+
$leftHandedOriginal \
5561
--expand-fill=4 "$@"
5662

5763
# Create install scripts
5864
echo
65+
leftHanded="--var right=" # Exclude
66+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
67+
leftHanded= # Default, include
68+
fi
5969
bin/mousegen windowsInstallScripts "$BUILD_DIR/NoShadow" --config configs \
60-
$THEME_COLORS --var version=$VERSION
70+
$THEME_COLORS --var version=$VERSION $leftHanded
6171
bin/mousegen windowsInstallScripts "$BUILD_DIR/Shadow" --config configs \
62-
$THEME_COLORS --var version=$VERSION --var shadow=Shadow
72+
$THEME_COLORS --var version=$VERSION --var shadow=Shadow $leftHanded
6373

6474
bin/mousegen validate wincur "$BUILD_DIR" > /dev/null
6575

@@ -73,7 +83,9 @@ for color in $MOUSE_COLORS; do
7383
if [ -z "$pkgName" ]; then continue; fi
7484
echo "Bibata-Windows-$pkgName-v$VERSION.zip"
7585
jar cMf ../Bibata-Windows-$pkgName-v$VERSION.zip COPYING */[MO]*-$dirName* */install-Bibata-$dirName*.inf
76-
echo "Bibata-Windows-Left-handed-$pkgName-v$VERSION.zip"
77-
jar cMf ../Bibata-Windows-Left-handed-$pkgName-v$VERSION.zip COPYING */Left*-$dirName* */install-Bibata-Left*-$dirName*.inf
86+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
87+
echo "Bibata-Windows-Left-handed-$pkgName-v$VERSION.zip"
88+
jar cMf ../Bibata-Windows-Left-handed-$pkgName-v$VERSION.zip COPYING */Left*-$dirName* */install-Bibata-Left*-$dirName*.inf
89+
fi
7890
done
7991
echo done.

‎bin/mousegen-xcursors‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,41 @@ set -e
3434
modernName='Modern-${color}-${size}-${outline}-${shadow}'
3535
originalName='Original-${color}-${size}-${outline}-${shadow}'
3636

37+
leftHandedModern=
38+
leftHandedOriginal=
39+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
40+
leftHandedModern="--source svg/modern-right --name \${shadow:Shadow}/Bibata-Left-handed-$modernName"
41+
leftHandedOriginal="--source svg/original-right --name \${shadow:Shadow}/Bibata-Left-handed-$originalName"
42+
fi
43+
3744
mousegenRender --source svg/modern --name "\${shadow:Shadow}/Bibata-$modernName" \
3845
--source svg/original --name "\${shadow:Shadow}/Bibata-$originalName" \
39-
--source svg/modern-right --name "\${shadow:Shadow}/Bibata-Left-handed-$modernName" \
40-
--source svg/original-right --name "\${shadow:Shadow}/Bibata-Left-handed-$originalName" \
46+
$leftHandedModern $leftHandedOriginal \
4147
--all-variants "$@"
4248

4349
echo
4450
echo "=== Thinner strokes with expanded fill"
4551
echo
4652
mousegenRender --linux-cursors=x11-names-efill-modern.json \
4753
--source svg/modern --name "\${shadow:Shadow}/Bibata-$modernName" \
48-
--source svg/modern-right --name "\${shadow:Shadow}/Bibata-Left-handed-$modernName" \
54+
$leftHandedModern \
4955
--expand-fill=4 "$@"
5056
echo
5157
mousegenRender --linux-cursors=x11-names-efill-original.json \
5258
--source svg/original --name "\${shadow:Shadow}/Bibata-$originalName" \
53-
--source svg/original-right --name "\${shadow:Shadow}/Bibata-Left-handed-$originalName" \
59+
$leftHandedOriginal \
5460
--expand-fill=4 "$@"
5561

5662
# Create theme files and symlinks
5763
echo
64+
leftHanded="--var right=" # Exclude
65+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
66+
leftHanded= # Default, include
67+
fi
5868
bin/mousegen linuxThemeFiles "$BUILD_DIR/NoShadow" --config configs \
59-
$THEME_COLORS --var version=$VERSION --var size= --var shadow=NoShadow
69+
$THEME_COLORS --var version=$VERSION --var size= --var shadow=NoShadow $leftHanded
6070
bin/mousegen linuxThemeFiles "$BUILD_DIR/Shadow" --config configs \
61-
$THEME_COLORS --var version=$VERSION --var size= --var shadow=
71+
$THEME_COLORS --var version=$VERSION --var size= --var shadow= $leftHanded
6272

6373
echo -n "Creating alias symlinks "
6474
bin/mousegen x11Symlinks -c configs "$BUILD_DIR"
@@ -81,7 +91,9 @@ for color in $MOUSE_COLORS; do
8191
if [ -z "$pkgName" ]; then continue; fi
8292
echo "Bibata-Xcursors-$pkgName-v$VERSION.tar.xz"
8393
tar cJf ../Bibata-Xcursors-$pkgName-v$VERSION.tar.xz COPYING */Bibata-[MO]*-$dirName*
84-
echo "Bibata-Xcursors-Left-handed-$pkgName-v$VERSION.tar.xz"
85-
tar cJf ../Bibata-Xcursors-Left-handed-$pkgName-v$VERSION.tar.xz COPYING */Bibata-Left*-$dirName*
94+
if [ "$MOUSE_LEFTHAND" = "true" ]; then
95+
echo "Bibata-Xcursors-Left-handed-$pkgName-v$VERSION.tar.xz"
96+
tar cJf ../Bibata-Xcursors-Left-handed-$pkgName-v$VERSION.tar.xz COPYING */Bibata-Left*-$dirName*
97+
fi
8698
done
8799
echo done.

0 commit comments

Comments
 (0)