1 files changed, 9 insertions, 14 deletions
diff --git a/PKGBUILD b/PKGBUILD
index ba4c590e50f2..d1b5caf8e57f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -53,7 +53,6 @@ _reset_ruby() {
 build() {
   _bundle=bundle
   _ruby=ruby
-  _rake=rake
   _gem=gem
   _builddir=$srcdir/build
 
@@ -62,14 +61,14 @@ build() {
   msg "Setup build directory"
   rm -rf $_builddir
   mkdir -p $_builddir
-  cp -Rf $srcdir/diaspora/{bin,app,config,db,public,lib,script,vendor,config.ru,Gemfile,Gemfile.lock,Rakefile,package.json,yarn.lock} $_builddir
+  cp -Rf $srcdir/diaspora/{bin,app,config,db,public,lib,script,vendor,config.ru,Gemfile,Gemfile.lock,Rakefile,package.json,yarn.lock,.foreman,Procfile} $_builddir
 
   cd $_builddir
 
   msg "Bundle dependencies"
   echo "gem: --no-rdoc --no-ri --no-user-install" > $_builddir/.gemrc
-  export GEM_HOME="$_builddir/vendor/bundle"
-  HOME=$_builddir $_gem install bundler -v 2.5.9
+  export GEM_HOME="$_builddir/vendor/bundle" \
+         BUNDLE_GEMFILE="$_builddir/Gemfile"
   HOME=$_builddir $_bundle config --local path vendor/bundle
   HOME=$_builddir $_bundle config --local frozen 1
   HOME=$_builddir $_bundle config --local disable_shared_gems true
@@ -77,6 +76,8 @@ build() {
   HOME=$_builddir $_bundle config --local without development:test
   HOME=$_builddir C_INCLUDE_PATH=/usr/include:/usr/include/tirpc $_bundle install
 
+  # Enforce bundler binstubs
+  $_bundle binstubs bundler foreman puma sidekiq rake rails --force
 
   # Workaround libsass.so not being found
   ln -s ../../../../extensions/x86_64-linux/3.3.0/sassc-2.4.0/sassc/libsass.so $_builddir/vendor/bundle/ruby/3.3.0/gems/sassc-2.4.0/lib/sassc/libsass.so
@@ -94,17 +95,15 @@ build() {
   cp $_builddir/config/database.yml{.example,}
 
   msg "Create secret token"
-  HOME=$_builddir RAILS_ENV=production $_bundle exec $_rake generate:secret_token
+  HOME=$_builddir RAILS_ENV=production bin/bundle exec rake generate:secret_token
 
   msg "Precompile assets"
-  HOME=$_builddir RAILS_ENV=production $_bundle exec $_rake assets:precompile
+  HOME=$_builddir RAILS_ENV=production bin/bundle exec rake assets:precompile
 
   rm $_builddir/config/{diaspora.toml,database.yml}
 }
 
 package() {
-  _bundle=bundle
-  _ruby=ruby
   _builddir=$srcdir/build
 
   msg "Copy contents to package directory"
@@ -112,6 +111,7 @@ package() {
   cp -Rf $_builddir/* $pkgdir/usr/share/webapps/diaspora/
   cp -Rf $_builddir/.bundle $pkgdir/usr/share/webapps/diaspora/
   install -Dm644 $_builddir/.gemrc $pkgdir/usr/share/webapps/diaspora/.gemrc
+  install -Dm644 $_builddir/.foreman $pkgdir/usr/share/webapps/diaspora/.foreman
   install -Dm640 $_builddir/config/initializers/secret_token.rb $pkgdir/etc/webapps/diaspora/secret_token.rb
   install -Dm644 $srcdir/diaspora.service $pkgdir/usr/lib/systemd/system/diaspora.service
   install -Dm644 $srcdir/diaspora.tmpfiles.d.conf $pkgdir/usr/lib/tmpfiles.d/diaspora.conf
@@ -122,11 +122,6 @@ package() {
   tar czf $pkgdir/usr/share/webapps/diaspora/public/source.tar.gz \
           $pkgdir/usr/share/webapps/diaspora/{app,db,lib,script,Gemfile,Gemfile.lock,Rakefile,config.ru}
 
-  msg "Symlink ruby and bundle"
-  install -dm755           $pkgdir/usr/share/webapps/diaspora/bin
-  ln -sf /usr/bin/$_ruby   $pkgdir/usr/share/webapps/diaspora/bin/ruby
-  ln -sf /usr/bin/$_bundle $pkgdir/usr/share/webapps/diaspora/bin/bundle
-
   msg "Prepare configuration files"
   install -dm750 $pkgdir/etc/webapps/diaspora
   install -Dm640 $_builddir/config/diaspora.toml.example $pkgdir/etc/webapps/diaspora/diaspora.toml
@@ -150,5 +145,5 @@ sha256sums=('SKIP'
             'aae126c4b1bcba6265d3d925dc3845bb034defa5606385c22dfb053111b57685'
             '2ac3ef6c4f0396b7738b18d07c56f57e0db5e5e194bf8b07ffd6ad790dd92e17'
             '7128024976c95d511d8995c472907fe0b8c36fe5b45fef57fc053e3fadcae408'
-            '77cb2529eacef2d1e77aad5daf21856f67097d6342f230e5dd5057f753932bfa'
+            '8a174c2a64aff5fe72ca6b61bb05c5d85f4cd5cbb91aa3a0334e8c5a15b45bd3'
             '29cfd5116e919d8851ff70b8b82af8d4a6c8243a9d1ca555981a1a695e2d7715')