Skip to content

Commit 9da19f9

Browse files
committed
Problem: not a lot of extensions listed
Solution: add pg_text_semver This highlighted a bug: we didn't process control files for extensions without .so files
1 parent edf9e90 commit 9da19f9

File tree

2 files changed

+26
-19
lines changed

2 files changed

+26
-19
lines changed

lib/pgpm/rpm/scripts/prepare_artifacts.sh

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ for file in $(find $PGPM_BUILDROOT -name '*.so'); do
1414
fi
1515
done
1616

17-
if [[ -n "$new_extension_so" ]]; then
17+
extdir=$PGPM_BUILDROOT$($PG_CONFIG --sharedir)/extension
18+
19+
# control files
20+
default_control=$extdir/$PGPM_EXTENSION_NAME.control
21+
versioned_control=$extdir/$PGPM_EXTENSION_NAME--$PGPM_EXTENSION_VERSION.control
22+
controls=("$default_control" "$versioned_control")
1823

19-
extdir=$PGPM_BUILDROOT$($PG_CONFIG --sharedir)/extension
24+
25+
if [[ -n "$new_extension_so" ]]; then
2026

2127
mv "$PGPM_BUILDROOT$extension_dirname/$extension_so" "$PGPM_BUILDROOT$extension_dirname/$new_extension_so"
2228

23-
# control files
24-
default_control=$extdir/$PGPM_EXTENSION_NAME.control
25-
versioned_control=$extdir/$PGPM_EXTENSION_NAME--$PGPM_EXTENSION_VERSION.control
26-
controls=("$default_control" "$versioned_control")
29+
# Change the extension name in controls
2730
for control in "${controls[@]}"; do
2831
if [[ -f "$control" ]]; then
2932
# extension.so
@@ -32,17 +35,6 @@ if [[ -n "$new_extension_so" ]]; then
3235
sed -i "s|${extension_so%".so"}'|${new_extension_so%".so"}'|g" "$control"
3336
fi
3437
done
35-
if [[ -f "$default_control" ]]; then
36-
if [[ -f "$versioned_control" ]]; then
37-
# We don't need default control if versioned is present
38-
rm -f "$default_control"
39-
else
40-
# Default becomes versioned
41-
mv "$default_control" "$versioned_control"
42-
# Don't need default_version
43-
sed -i '/default_version/d' "$versioned_control"
44-
fi
45-
fi
4638

4739
# sql files
4840
for sql_file in $(find $PGPM_BUILDROOT -name '*.sql' -type f); do
@@ -78,4 +70,19 @@ if [[ -n "$new_extension_so" ]]; then
7870

7971
# TODO: share, docs, etc.
8072

73+
fi
74+
75+
76+
# Make sure we don't build a default control as it belongs
77+
# to another package
78+
if [[ -f "$default_control" ]]; then
79+
if [[ -f "$versioned_control" ]]; then
80+
# We don't need default control if versioned is present
81+
rm -f "$default_control"
82+
else
83+
# Default becomes versioned
84+
mv "$default_control" "$versioned_control"
85+
# Don't need default_version
86+
sed -i '/default_version/d' "$versioned_control"
87+
fi
8188
fi

packages/pg_text_semver.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

3-
class Pgvector < Pgpm::Package
4-
github "pgvector/pgvector"
3+
class PgTextSemver < Pgpm::Package
4+
github "bigsmoke/pg_text_semver"
55
end

0 commit comments

Comments
 (0)