Skip to content
This repository was archived by the owner on Aug 24, 2024. It is now read-only.

Commit 8d1df0e

Browse files
committed
fix: Repositories not detected in software-protperties-gtk
BREAKING CHANGES: - Changes repository `.list` file prefix from `adter-effects:` to `after-effects-`. This has unintended side effect of adding repositories multiple times if you ever run older versions or did run older version of this script. - Migration: Rename existing list files with prefix `after-effecs:` to `after-efects-`. This shuld be done before running this script.
1 parent d5fa0a0 commit 8d1df0e

File tree

5 files changed

+38
-39
lines changed

5 files changed

+38
-39
lines changed

after-effects

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ readonly SCRIPT=$(basename "$0")
1818
readonly dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
1919

2020
# Version
21-
readonly AE_VERSION="8.0.0"
21+
readonly AE_VERSION="8.0.1"
2222

2323
# Handle Use interrupt
2424
# trap ctrl-c and call ctrl_c()
@@ -1568,7 +1568,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
15681568
--file-prefix "spotify" \
15691569
--key-url https://download.spotify.com/debian/pubkey_0D811D58.gpg
15701570

1571-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/spotify.gpg] http://repository.spotify.com stable non-free #Spotify" > ${SOURCES_FILE_DIR}/after-effects:spotify.list; then
1571+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/spotify.gpg] http://repository.spotify.com stable non-free #Spotify" > ${SOURCES_FILE_DIR}/after-effects-spotify.list; then
15721572
log_success "OK"
15731573
else
15741574
log_error "Adding Spotify Repository Failed"
@@ -1586,7 +1586,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
15861586
--file-prefix "skype" \
15871587
--key-url https://repo.skype.com/data/SKYPE-GPG-KEY
15881588

1589-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/skype.gpg] https://repo.skype.com/deb stable main #Skype" > $SOURCES_FILE_DIR/after-effects:skype.list; then
1589+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/skype.gpg] https://repo.skype.com/deb stable main #Skype" > ${SOURCES_FILE_DIR}/after-effects-skype.list; then
15901590
log_success "OK"
15911591
else
15921592
log_error "Adding Skype for linux repository failed"
@@ -1603,7 +1603,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
16031603
--file-prefix "signal-desktop" \
16041604
--key-url https://updates.signal.org/desktop/apt/keys.asc
16051605

1606-
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/signal-desktop.gpg] https://updates.signal.org/desktop/apt xenial main #Signal-for-Desktop" > ${SOURCES_FILE_DIR}/after-effects:signal.list; then
1606+
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/signal-desktop.gpg] https://updates.signal.org/desktop/apt xenial main #Signal-for-Desktop" > ${SOURCES_FILE_DIR}/after-effects-signal.list; then
16071607
log_success "OK"
16081608
else
16091609
log_error "Failed to addd Signal for desktop repository!"
@@ -1639,7 +1639,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
16391639
__add_repo_keys --format "asc" \
16401640
--file-prefix "wine-hq" \
16411641
--key-url https://dl.winehq.org/wine-builds/winehq.key
1642-
if echo "deb [signed-by=${TRUSTED_KEYRINGS_DIR}/wine-hq.gpg] https://dl.winehq.org/wine-builds/${distro_name}/ ${code_name} main #WineHQ" > ${SOURCES_FILE_DIR}/after-effects:winehq.list; then
1642+
if echo "deb [signed-by=${TRUSTED_KEYRINGS_DIR}/wine-hq.gpg] https://dl.winehq.org/wine-builds/${distro_name}/ ${code_name} main #WineHQ" > ${SOURCES_FILE_DIR}/after-effects-winehq.list; then
16431643
log_success "OK"
16441644
else
16451645
log_error "Adding WineHQ repository failed"
@@ -1670,7 +1670,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
16701670
# Google Cloud SDK
16711671
if [ "$add_gcp_repo" == "true" ]; then
16721672
log_info "Google-Cloud-SDK"
1673-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/google-cloud-packaging.gpg] http://packages.cloud.google.com/apt cloud-sdk main #Google-Cloud-SDK" > ${SOURCES_FILE_DIR}/after-effects:googlecloud.list; then
1673+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/google-cloud-packaging.gpg] http://packages.cloud.google.com/apt cloud-sdk main #Google-Cloud-SDK" > ${SOURCES_FILE_DIR}/after-effects-googlecloud.list; then
16741674
log_success "OK"
16751675
else
16761676
log_error "Adding Google Cloud SDK Repository failed"
@@ -1684,7 +1684,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
16841684

16851685
if [[ $ARCH == "amd64" ]]; then
16861686
log_info "GCSFUSE"
1687-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/google-cloud-packaging.gpg] http://packages.cloud.google.com/apt gcsfuse-${code_name} main #GCSFUSE" > ${SOURCES_FILE_DIR}/after-effects:gcsfuse.list; then
1687+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/google-cloud-packaging.gpg] http://packages.cloud.google.com/apt gcsfuse-${code_name} main #GCSFUSE" > ${SOURCES_FILE_DIR}/after-effects-gcsfuse.list; then
16881688
log_success "OK"
16891689
else
16901690
log_error "Adding GCSFUSE repository failed"
@@ -1712,7 +1712,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
17121712
if [[ ${add_vscode_repo} == "true" ]]; then
17131713
log_info "VSCode"
17141714
if [[ ${ARCH} == "amd64" ]]; then
1715-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/vscode stable main #Visual-Studio-Code" > ${SOURCES_FILE_DIR}/after-effects:vscode.list; then
1715+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/vscode stable main #Visual-Studio-Code" > ${SOURCES_FILE_DIR}/after-effects-vscode.list; then
17161716
log_success "OK"
17171717
else
17181718
log_error "Failed to addd VSCode repository!"
@@ -1730,7 +1730,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
17301730
if [[ ${add_azurecli_repo} == "true" ]] ; then
17311731
if [[ ${ARCH} == "amd64" ]]; then
17321732
log_info "Azure CLI"
1733-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ ${code_name} main #Azure CLI" > ${SOURCES_FILE_DIR}/after-effects:azurecli.list; then
1733+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ ${code_name} main #Azure CLI" > ${SOURCES_FILE_DIR}/after-effects-azurecli.list; then
17341734
log_success "OK"
17351735
else
17361736
log_error "Failed to addd Azure CLI repository!"
@@ -1747,7 +1747,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
17471747
if [[ ${add_edge_repo} == "true" ]] ; then
17481748
if [[ ${ARCH} == "amd64" ]]; then
17491749
log_info "Microsoft Edge"
1750-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/edge stable main #Microsoft Edge" > ${SOURCES_FILE_DIR}/after-effects:edge.list; then
1750+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/edge stable main #Microsoft Edge" > ${SOURCES_FILE_DIR}/after-effects-edge.list; then
17511751
log_success "OK"
17521752
else
17531753
log_error "Failed to addd Microsoft Edge repository!"
@@ -1763,7 +1763,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
17631763
if [[ ${add_msteams_repo} == "true" ]] ; then
17641764
if [[ ${ARCH} == "amd64" ]]; then
17651765
log_info "Microsoft Teams"
1766-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/ms-teams stable main #Microsoft Edge" > ${SOURCES_FILE_DIR}/after-effects:teams.list; then
1766+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/microsoft.gpg] https://packages.microsoft.com/repos/ms-teams stable main #Microsoft Edge" > ${SOURCES_FILE_DIR}/after-effects-teams.list; then
17671767
log_success "OK"
17681768
else
17691769
log_error "Failed to addd Microsoft Teams repository!"
@@ -1783,7 +1783,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
17831783
--key-url https://download.docker.com/linux/"${distro_name}"/gpg
17841784
log_debug "Adding Docker(Docker Inc) sources .list"
17851785

1786-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/docker-ce.gpg] https://download.docker.com/linux/${distro_name} ${code_name} stable #Docker-Community-Edition" > ${SOURCES_FILE_DIR}/after-effects:docker.list; then
1786+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/docker-ce.gpg] https://download.docker.com/linux/${distro_name} ${code_name} stable #Docker-Community-Edition" > ${SOURCES_FILE_DIR}/after-effects-docker.list; then
17871787
log_success "OK"
17881788
else
17891789
log_error "Adding Docker-CE repository failed"
@@ -1802,7 +1802,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
18021802
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C99B11DEB97541F0 |& log_trace "${_phase_apt_key}" \
18031803
|| log_error "Adding Github CLI keys failed"
18041804

1805-
if echo "deb https://cli.github.com/packages ${code_name} main #GitHub-CLI" > ${SOURCES_FILE_DIR}/after-effects:github.list; then
1805+
if echo "deb https://cli.github.com/packages ${code_name} main #GitHub-CLI" > ${SOURCES_FILE_DIR}/after-effects-github.list; then
18061806
log_success "OK"
18071807
else
18081808
log_error "Adding GH CLi repository failed"
@@ -1820,7 +1820,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
18201820
--file-prefix "hashicorp" \
18211821
--key-url https://apt.releases.hashicorp.com/gpg
18221822

1823-
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/hashicorp.gpg] https://apt.releases.hashicorp.com ${code_name} main#Hashicorp-Packages" > ${SOURCES_FILE_DIR}/after-effects:hashicorp.list; then
1823+
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/hashicorp.gpg] https://apt.releases.hashicorp.com ${code_name} main#Hashicorp-Packages" > ${SOURCES_FILE_DIR}/after-effects-hashicorp.list; then
18241824
log_success "OK"
18251825
else
18261826
log_error "Failed to add hashicorp repository"
@@ -1841,7 +1841,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
18411841
--file-prefix "bazel" \
18421842
--key-url https://bazel.build/bazel-release.pub.gpg
18431843

1844-
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/bazel.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8 #Bazel" > ${SOURCES_FILE_DIR}/after-effects:bazel.list; then
1844+
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/bazel.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8 #Bazel" > ${SOURCES_FILE_DIR}/after-effects-bazel.list; then
18451845
log_success "OK"
18461846
else
18471847
log_error "Failed to add bazel repository"
@@ -1866,7 +1866,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
18661866
--file-prefix "gvisor" \
18671867
--key-url https://gvisor.dev/archive.key
18681868

1869-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/gvisor.gpg] https://storage.googleapis.com/gvisor/releases release main #gVisor-Container-Runtime" > ${SOURCES_FILE_DIR}/after-effects:gvisor.list; then
1869+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/gvisor.gpg] https://storage.googleapis.com/gvisor/releases release main #gVisor-Container-Runtime" > ${SOURCES_FILE_DIR}/after-effects-gvisor.list; then
18701870
log_success "OK"
18711871
else
18721872
log_error "Adding gVisor repository failed!"
@@ -1891,7 +1891,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
18911891
__add_repo_keys --format "asc" \
18921892
--file-prefix "obs-podman-${code_name}" \
18931893
--key-url https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${AE_OBS_PREFIX}/Release.key
1894-
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/obs-podman-${code_name}.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${AE_OBS_PREFIX}/ / #Podman (via OBS)" > ${SOURCES_FILE_DIR}/after-effects:podman.list; then
1894+
if echo "deb [arch=$ARCH signed-by=${TRUSTED_KEYRINGS_DIR}/obs-podman-${code_name}.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/${AE_OBS_PREFIX}/ / #Podman (via OBS)" > ${SOURCES_FILE_DIR}/after-effects-podman.list; then
18951895
log_success "OK"
18961896
else
18971897
log_error "Adding Podman repository failed!"
@@ -1919,7 +1919,7 @@ deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main"
19191919
--file-prefix "sublimetext" \
19201920
--key-url https://download.sublimetext.com/sublimehq-pub.gpg
19211921

1922-
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/sublimetext.gpg] https://download.sublimetext.com/ apt/stable/ #SublimeText Editor" > ${SOURCES_FILE_DIR}/after-effects:sublimetext.list; then
1922+
if echo "deb [arch=amd64 signed-by=${TRUSTED_KEYRINGS_DIR}/sublimetext.gpg] https://download.sublimetext.com/ apt/stable/ #SublimeText Editor" > ${SOURCES_FILE_DIR}/after-effects-sublimetext.list; then
19231923
log_success "OK"
19241924
else
19251925
log_error "Failed to add SublimeText repository"

after-effects.asc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
-----BEGIN PGP SIGNATURE-----
22

3-
iQIzBAABCgAdFiEE8FV2m9/w2tr5gevHB8IBTKWxN9gFAmCb4/sACgkQB8IBTKWx
4-
N9hoxQ/8C3xLgD3FhFO/QbF/fo0JiVvugSmMiz6W8QpBAoobNpOjbT1NI53RW+6r
5-
gDFsbpKsO+jwNNRcUMG5VaWc0cJaHN4e6FLhaIoNcZrrnUypaDSpZKL2oZ4WnB5Z
6-
PuLWU+wikEomp1igauROV3utw9athPGUPt0kOIU9s7bfV39KqkDScPlIFj7EiETq
7-
af7mcSk+aAXB2xrkvmnOcuqOnDQT2Gz/4m/lhpuGbHeL31bLWINjPbcKa62GDMDo
8-
OGeaz2/yRsh2Aj5YCdVtlqGyVKbIrbx8EOj5Dms1aisZ/GylscpqB8AdjIiozYd0
9-
4vEo1Y3n7eUJFnUwYMWXScTY1O0SC0K1cGHJwF7jzRb3K7v6SpRX8vtqd/sGzm72
10-
p3Dd5SELMBcfDV9sDNEny3BnR+hDGFkaSbqG0Uila7d1LBls1XOmQt3wbtfYyFAT
11-
uEypDD0MLS6qsOwsqPCrku8BWCImnqssfeOsEl+AIQlOjW7SEEhcCBI3ZTfdVjQZ
12-
0+TT8gcsg6E0plmHCLRTSqQ6WFQPDc2IzJw0ATPhdrSOcbstsZ2ocG4XNYzYZJRt
13-
HArXTFGeO5ZKn9c+3U9HO3PpTCp9IALI/Ip1dQkoOmMK8m6lAH5fMGtbTLN4GG5V
14-
br51nb/CJTVbpVbbTCCY3EDsDS+3xTLdpkUoSw1WGGCiMgDKFPg=
15-
=YmYu
3+
iQIzBAABCgAdFiEE8FV2m9/w2tr5gevHB8IBTKWxN9gFAmClW4cACgkQB8IBTKWx
4+
N9i6dA//XGH6244VKdNGgBwfNQKZ1+mh0XsModdwjhDcdPrlCN738EKoBH4rK/8F
5+
CmmVmHHOxxUFMOvbLcLUd/+NkpoTGb0oTGI8s7LaUo5BszTa15hFj3U2ob982mdA
6+
Qlc4BMUvs3pf+hV43nUtk/sbL70n6PDAaDAuVwOvvdyHrojz2kpgCgGJIbIszE7e
7+
y+xe6HnTra2BMtGYWnJaUUOhOEp6ON/6mQUrwDhtrKItR21gZb3nrhwa0FLV2g2Z
8+
NuJMrfDG/mD+BC6F0K1lObGsAAWWguOBDdOR9ve/94ROOn0GGcd/4tFAua+1TSkj
9+
lSq74d3FynHjXhOcPj74zeh+Gl3L4FsutsMBpFWOXC17pAj3rmE10jRmTK35URUj
10+
+AElLHzRptb30yaRFlneLtXe9XG+bQAClz7UeoWbdUR3AdyAdNqqbCCJ4WcxJR6Q
11+
D2GAYN+XcXsU7oNulWz0zNwAeJRe9x51uh2BSk1tzDRNTk7gQT6F/vo2Disgj+Yn
12+
66T/uTiD+ldi6hC1FTLbNuy6Qx+ENWr0SlNXHUUrLxufbkaORRjkfOPOSM2g4Xjn
13+
Vi83BCFP7T8NkMKPFQzF3DqX9GqWprvFWyBQJbBrc30Ef7rWMP9lJ54JsnqVn8ZM
14+
5RnfRNQHxvwxiQTTVFHksP+8FjMUusoqwloArXQHlfENF8M/mYQ=
15+
=R40h
1616
-----END PGP SIGNATURE-----

config/version.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# This file is required because of legacy update checks use this file.
1+
# This file is required because, legacy update checks use this file.
22
# Netlify should handle the redirects from get/v3/version endpoints.
3-
# This is setup in such a way to force user to upgrade the script,
4-
# without breaking older versions.
5-
# Updated versions of the script uses GitHub v3 API endpoints.
3+
# This config is setup in such a way, that user is to forced to
4+
# upgrade the script, without breaking update check mechanisms.
5+
# Updated versions of the script uses GitHub v3 releases API.
66
version:
77
number: 65500
8-
name: FORCE-UPDATE-TO-8.0.0-AND-ABOVE
8+
name: FORCE-UPDATE-TO-8.0.1-AND-ABOVE

docs/tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ config:
153153

154154
## Install Static binaries to /usr/local/bin
155155

156-
This will install binaries `bin.list` or YAML config under `config.install.binaries`.
156+
This will install binaries in YAML config under `config.install.binaries`.
157157

158158
- **Simulate** option **will** download the package but not install it.
159159
- Configuration is similar to deb files mentioned above. First part is the URL to the binary file followed by ',' and name of the binary.
@@ -175,7 +175,7 @@ config:
175175
This will purge Unwanted packages from the system.
176176

177177
- The packages mentioned in `config.purge` in yaml.
178-
- The format of the purge.list is similar to that of packages, one package per line
178+
- The format is similar to that of packages, one package per line
179179

180180
!!! warning
181181
It is necessary to pass command line argument `-d` or set `config.flags.purge_enabled: true` in config.

tests/local.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ function main()
119119
# turn on trace
120120
set -x
121121
docker run --rm \
122-
--userns=host \
123122
"${DOCKER_RUN_ARGS[@]}" \
124123
-e CI \
125124
-e GITHUB_ACTIONS \

0 commit comments

Comments
 (0)