Skip to content

Commit 0b318e1

Browse files
VampireVampire
committed
Adapt to changed kali-linux distribution ID
1 parent ad61c67 commit 0b318e1

File tree

3 files changed

+71
-238
lines changed

3 files changed

+71
-238
lines changed

‎.github/workflows/test.main.kts

Lines changed: 19 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ val alpine = Distribution(
8080
)
8181

8282
val kali = Distribution(
83-
wslId = "kali-linux",
83+
wslId = "MyDistribution",
8484
userId = "kali-linux",
8585
matchPattern = "*Kali*",
8686
defaultAbsentTool = "dos2unix"
@@ -471,14 +471,7 @@ workflowWithCopyright(
471471
|(
472472
${it.prependIndent("| ")}
473473
|)
474-
|&& (
475-
| (matrix.distribution.user-id != '${kali.userId}')
476-
| || (
477-
| (
478-
${getWslVersionExpression(kali).prependIndent("| ")}
479-
| ) == '2'
480-
| )
481-
|)
474+
|&& (matrix.distribution.user-id != '${kali.userId}')
482475
""".trimMargin()
483476
},
484477
action = executeAction.copy(
@@ -495,14 +488,7 @@ workflowWithCopyright(
495488
|(
496489
${it.prependIndent("| ")}
497490
|)
498-
|&& (
499-
| (matrix.distribution.user-id != '${kali.userId}')
500-
| || (
501-
| (
502-
${getWslVersionExpression(kali).prependIndent("| ")}
503-
| ) == '2'
504-
| )
505-
|)
491+
|&& (matrix.distribution.user-id != '${kali.userId}')
506492
""".trimMargin()
507493
},
508494
actualCommand = "whoami",
@@ -516,14 +502,7 @@ workflowWithCopyright(
516502
|(
517503
${it.prependIndent("| ")}
518504
|)
519-
|&& (
520-
| (matrix.distribution.user-id != '${kali.userId}')
521-
| || (
522-
| (
523-
${getWslVersionExpression(kali).prependIndent("| ")}
524-
| ) == '2'
525-
| )
526-
|)
505+
|&& (matrix.distribution.user-id != '${kali.userId}')
527506
""".trimMargin()
528507
},
529508
action = executeAction.copy(
@@ -746,14 +725,7 @@ workflowWithCopyright(
746725
wslVersion_Untyped = expr(getWslVersionExpression(kali))
747726
),
748727
// part of work-around for https://bugs.kali.org/view.php?id=8921
749-
condition = """
750-
|(matrix.distribution.user-id != '${kali.userId}')
751-
||| (
752-
| (
753-
${getWslVersionExpression(kali).prependIndent("| ")}
754-
| ) == '2'
755-
|)
756-
""".trimMargin()
728+
condition = "matrix.distribution.user-id != '${kali.userId}'"
757729
)
758730
runAfterSuccess(
759731
name = "Test - ${expr("matrix.distribution.default-absent-tool")} should be installed",
@@ -764,14 +736,7 @@ workflowWithCopyright(
764736
|(
765737
${it.prependIndent("| ")}
766738
|)
767-
|&& (
768-
| (matrix.distribution.user-id != '${kali.userId}')
769-
| || (
770-
| (
771-
${getWslVersionExpression(kali).prependIndent("| ")}
772-
| ) == '2'
773-
| )
774-
|)
739+
|&& (matrix.distribution.user-id != '${kali.userId}')
775740
""".trimMargin()
776741
}
777742
)
@@ -784,14 +749,7 @@ workflowWithCopyright(
784749
|(
785750
${it.prependIndent("| ")}
786751
|)
787-
|&& (
788-
| (matrix.distribution.user-id != '${kali.userId}')
789-
| || (
790-
| (
791-
${getWslVersionExpression(kali).prependIndent("| ")}
792-
| ) == '2'
793-
| )
794-
|)
752+
|&& (matrix.distribution.user-id != '${kali.userId}')
795753
""".trimMargin()
796754
}
797755
)
@@ -1059,14 +1017,7 @@ workflowWithCopyright(
10591017
additionalPackages = listOf(
10601018
expr(
10611019
"""
1062-
|(
1063-
| (matrix.distribution.user-id != '${kali.userId}')
1064-
| || (
1065-
| (
1066-
${getWslVersionExpression(kali).prependIndent("| ")}
1067-
| ) == '2'
1068-
| )
1069-
|)
1020+
|(matrix.distribution.user-id != '${kali.userId}')
10701021
|&& 'bash'
10711022
||| ''
10721023
""".trimMargin()
@@ -1076,7 +1027,7 @@ workflowWithCopyright(
10761027
// and https://bugs.kali.org/view.php?id=6672
10771028
// and https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2069555
10781029
wslVersion = null,
1079-
wslVersion_Untyped = expr(getWslVersionExpression(kali, ubuntu2404))
1030+
wslVersion_Untyped = expr(getWslVersionExpression(ubuntu2404))
10801031
)
10811032
)
10821033
usesSelf(
@@ -1088,14 +1039,14 @@ workflowWithCopyright(
10881039
// part of work-around for https://bugs.kali.org/view.php?id=6672
10891040
// and https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2069555
10901041
condition = """
1091-
|(
1092-
| (matrix.distribution.user-id != '${kali.userId}')
1093-
| && (matrix.distribution.user-id != '${ubuntu2404.userId}')
1094-
|)
1095-
||| (
1096-
| (
1097-
${getWslVersionExpression(kali, ubuntu2404).prependIndent("| ")}
1098-
| ) == '2'
1042+
|(matrix.distribution.user-id != '${kali.userId}')
1043+
|&& (
1044+
| (matrix.distribution.user-id != '${ubuntu2404.userId}')
1045+
| || (
1046+
| (
1047+
${getWslVersionExpression(ubuntu2404).prependIndent("| ")}
1048+
| ) == '2'
1049+
| )
10991050
|)
11001051
""".trimMargin()
11011052
)
@@ -1106,14 +1057,7 @@ workflowWithCopyright(
11061057
wslVersion = null
11071058
),
11081059
// part of work-around for https://bugs.kali.org/view.php?id=8921
1109-
condition = """
1110-
|(matrix.distribution.user-id != '${kali.userId}')
1111-
||| (
1112-
| (
1113-
${getWslVersionExpression(kali).prependIndent("| ")}
1114-
| ) == '2'
1115-
|)
1116-
""".trimMargin()
1060+
condition = "(matrix.distribution.user-id != '${kali.userId}')"
11171061
)
11181062
runAfterSuccess(
11191063
name = "Test - ${expr("matrix.distribution.default-absent-tool")} should be installed",
@@ -1124,14 +1068,7 @@ workflowWithCopyright(
11241068
|(
11251069
${it.prependIndent("| ")}
11261070
|)
1127-
|&& (
1128-
| (matrix.distribution.user-id != '${kali.userId}')
1129-
| || (
1130-
| (
1131-
${getWslVersionExpression(kali).prependIndent("| ")}
1132-
| ) == '2'
1133-
| )
1134-
|)
1071+
|&& (matrix.distribution.user-id != '${kali.userId}')
11351072
""".trimMargin()
11361073
}
11371074
)

0 commit comments

Comments
 (0)