Refactor: prepare_artifacts in deb/

Author: qount25

lib/pgpm/deb/scripts/install_default_control.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ext_dir="$PGPM_BUILDDEB/$(pg_config --sharedir)/extension"
+ext_dir="${PGPM_INSTALL_ROOT:-$PGPM_BUILDROOT}/$(pg_config --sharedir)/extension"
 control_fn="$ext_dir/$PGPM_EXTENSION_NAME.control"
 
 echo "Creating extension dir: $ext_dir"

lib/pgpm/deb/scripts/prepare_artifacts.sh

@@ -4,12 +4,14 @@
 
 new_extension_so=
 
-echo $PGPM_BUILDROOT
-echo $PGPM_EXTENSION_NAME
-echo $PGPM_EXTENSION_VERSION
-PG_CONFIG="pg_config"
-echo "pg_config: $(which pg_config)"
-echo "pg_config sharedir: $(pg_config --sharedir)"
+PG_CONFIG="${PG_CONFIG:-"pg_config"}"
+
+# When building with pbuilder on Debian, files are installed under
+# `$PGPM_BUILDROOT/debian/ext-name-0.0.0/`  -- this path should then be
+# assigned to the PGPM_INSTALL_ROOT env variable. However it isn't assigned
+# to it (as is the case with rpm and mock), then we use PGPM_BUILDROOT instead.
+# In this script we're 
+install_root="${PGPM_INSTALL_ROOT:-$PGPM_BUILDROOT}"
 
 for file in $(find $PGPM_BUILDROOT -name '*.so'); do
   filename=$(basename "$file")
@@ -22,40 +24,21 @@ for file in $(find $PGPM_BUILDROOT -name '*.so'); do
   fi
 done
 
-extdir=$PGPM_BUILDDEB$($PG_CONFIG --sharedir)/extension
+extdir=$install_root$($PG_CONFIG --sharedir)/extension
 
 # control files
 default_control=$extdir/$PGPM_EXTENSION_NAME.control
 versioned_control=$extdir/$PGPM_EXTENSION_NAME--$PGPM_EXTENSION_VERSION.control
 controls=("$default_control" "$versioned_control")
 
-echo "PWD: $(pwd)"
-
-echo "----------------------"
-echo "extension_dirname: $extension_dirname"
-echo "new_extension_so: $new_extension_so"
-echo "default_control: $default_control"
-echo "versioned_control: $versioned_control"
-echo "extension_so: $extension_so"
-echo "extdir: $extdir"
-echo "PGPM_BUILDDEB: $PGPM_BUILDDEB"
-echo "----------------------"
-
-echo "CONTROLS CONTENTS"
-echo "-----------------"
-echo "DEFAULT CONTROL:"
-cat $default_control
-echo "\nVERSIONED CONTROL:"
-cat $versioned_control
-echo "-----------------"
-
-if [[ -n "$new_extension_so" ]]; then
-
-  mv "$PGPM_BUILDDEB$extension_dirname/$extension_so" "$PGPM_BUILDDEB$extension_dirname/$new_extension_so"
+function rename_so() {
+  mv "$install_root$extension_dirname/$extension_so" \
+     "$install_root$extension_dirname/$new_extension_so"
+}
 
-  echo "CHANGING EXTENSION NAME IN CONTROLS"
-  echo "-----------------------------------"
-  # Change the extension name in controls
+function change_name_in_controls() {
+  echo "CHANGING EXTENSION NAME IN CONTROL FILES"
+  echo "----------------------------------------"
   for control in "${controls[@]}"; do
     if [[ -f "$control" ]]; then
       echo "$control"
@@ -65,29 +48,28 @@ if [[ -n "$new_extension_so" ]]; then
       sed -i "s|${extension_so%".so"}'|${new_extension_so%".so"}'|g" "$control"
     fi
   done
-  echo "-----------------------------------"
+}
 
-  # sql files
-  echo "SQL FILES"
-  echo "---------"
-  for sql_file in $(find $PGPM_BUILDDEB -name '*.sql' -type f); do
+function rename_sql_files() {
+  echo "RENAMING EXTENSION SQL FILES"
+  echo "----------------------------"
+  for sql_file in $(find $install_root -name '*.sql' -type f); do
     echo "$sql_file"
     # extension.so
     sed -i "s|/${extension_so}'|/${new_extension_so}'|g" "$sql_file"
     # extension
     sed -i "s|/${extension_so%".so"}'|/${new_extension_so}'|g" "$sql_file"
   done
-  echo "---------"
+}
 
-  # bitcode
-
-  pkglibdir=$PGPM_BUILDDEB$($PG_CONFIG --pkglibdir)
+function rename_bitcode() {
+  echo "RENAMING BITCODE"
+  echo "----------------"
 
+  pkglibdir=$install_root$($PG_CONFIG --pkglibdir)
   bitcode_extension=$pkglibdir/bitcode/${extension_so%".so"}
   bitcode_index=$pkglibdir/bitcode/${extension_so%".so"}.index.bc
 
-  echo "BITCODE"
-  echo "-------"
   if [[ -d "${bitcode_extension}" ]]; then
     echo "$bitcode_extension"
     mv "$bitcode_extension" "$pkglibdir/bitcode/${new_extension_so%".so"}"
@@ -97,36 +79,42 @@ if [[ -n "$new_extension_so" ]]; then
     echo "$bitcode_index"
     mv "${bitcode_index}" "$pkglibdir/bitcode/${new_extension_so%".so"}.index.bc"
   fi
-  echo "-------"
-
-  # includes
-  includedir=$PGPM_BUILDDEB$($PG_CONFIG --includedir-server)
+}
 
-  echo "INCLUDES"
-  echo "--------"
+function rename_includes() {
+  includedir=$install_root$($PG_CONFIG --includedir-server)
+  echo "RENAMING INCLUDES"
+  echo "-----------------"
   if [[ -d "${includedir}/extension/$PGPM_EXTENSION_NAME" ]]; then
     echo "$includedir"
     versioned_dir=${includedir}/extension/$PGPM_EXTENSION_NAME--$PGPM_EXTENSION_VERSION
     mkdir -p "$versioned_dir"
     mv "${includedir}/extension/$PGPM_EXTENSION_NAME" "$versioned_dir"
   fi
-  echo "--------"
-
-  # TODO: share, docs, etc.
-
-fi
-
+}
 
 # Make sure we don't build a default control as it belongs
 # to another package
-if [[ -f "$default_control" ]]; then
-  if [[ -f "$versioned_control" ]]; then
-    # We don't need default control if versioned is present
-    rm -f "$default_control"
-  else
-    # Default becomes versioned
-    mv "$default_control" "$versioned_control"
-    # Don't need default_version
-    sed -i '/default_version/d' "$versioned_control"
+function handle_default_control() {
+  if [[ -f "$default_control" ]]; then
+    if [[ -f "$versioned_control" ]]; then
+      # We don't need default control if versioned is present
+      rm -f "$default_control"
+    else
+      # Default becomes versioned
+      mv "$default_control" "$versioned_control"
+      # Don't need default_version
+      sed -i '/default_version/d' "$versioned_control"
+    fi
   fi
+}
+
+if [[ -n "$new_extension_so" ]]; then
+  rename_so
+  change_name_in_controls
+  rename_sql_files
+  rename_bitcode
+  rename_incluides
 fi
+
+handle_default_control

lib/pgpm/deb/templates/rules.erb

@@ -15,7 +15,7 @@ override_dh_install:
 	export PGPM_BUILDROOT="$(DEB_BUILDDIR)"; \
 	export PGPM_EXTENSION_NAME=$(EXTENSION_NAME); \
 	export PGPM_EXTENSION_VERSION="<%= self.package.version %>"; \
-	export PGPM_BUILDDEB="$(DEB_BUILDDIR)/debian/<%= deb_pkg_name(pkg_type) %>"; \
+	export PGPM_INSTALL_ROOT="$(DEB_BUILDDIR)/debian/<%= deb_pkg_name(pkg_type) %>"; \
 	./prepare_artifacts.sh
 
 <%= self.package.build_info[:rules] %>
@@ -35,6 +35,6 @@ install:
 	export PGPM_BUILDROOT="$(DEB_BUILDDIR)"; \
 	export PGPM_EXTENSION_NAME=$(EXTENSION_NAME); \
 	export PGPM_EXTENSION_VERSION="<%= self.package.version %>"; \
-	export PGPM_BUILDDEB="$(DEB_BUILDDIR)/debian/<%= deb_pkg_name(pkg_type) %>"; \
+	export PGPM_INSTALL_ROOT="$(DEB_BUILDDIR)/debian/<%= deb_pkg_name(pkg_type) %>"; \
 	./install_default_control.sh
 <% end %>