Skip to content

Commit

Permalink
replace env ruby with native path (#449)
Browse files Browse the repository at this point in the history
* replace env ruby with native path

builds in home branch on OBS succeeded.

* version bump + changelog
  • Loading branch information
ZenNoe committed Nov 17, 2020
1 parent ff798ab commit 324403b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 0 additions & 1 deletion package/SUSEConnect-rpmlintrc
@@ -1,3 +1,2 @@
# this patch gets applied conditionally inline the .spec file
addFilter("SUSEConnect.src: W: patch-not-applied Patch0: switch_server_cert_location_to_etc.patch")
addFilter("SUSEConnect.x86_64: E: env-script-interpreter")
5 changes: 5 additions & 0 deletions package/SUSEConnect.changes
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 17 09:36:24 UTC 2020 - Tamara Schmitz <tamara.schmitz@suse.com>

- replace env ruby path with native ruby path during build phase

-------------------------------------------------------------------
Mon Sep 28 17:36:08 UTC 2020 - Thomas Schmidt <tschmidt@suse.com>

Expand Down
5 changes: 4 additions & 1 deletion package/SUSEConnect.spec
Expand Up @@ -17,7 +17,7 @@


Name: SUSEConnect
Version: 0.3.28
Version: 0.3.29
Release: 0
%define mod_name suse-connect
%define mod_full_name %{mod_name}-%{version}
Expand Down Expand Up @@ -128,6 +128,9 @@ touch %{buildroot}%_sysconfdir/SUSEConnect
mkdir -p %{buildroot}%_sysconfdir/zypp/credentials.d/
touch %{buildroot}%_sysconfdir/zypp/credentials.d/SCCcredentials

# replace /usr/bin/env with native ruby path
sed -i "1s/.*/#\!\/usr\/bin\/ruby\.%{ruby_version}/" %{buildroot}%{_sbindir}/%{name}

%post
if [ -s /etc/zypp/credentials.d/NCCcredentials ] && [ ! -e /etc/zypp/credentials.d/SCCcredentials ]; then
echo "Imported NCC system credentials to /etc/zypp/credentials.d/SCCcredentials"
Expand Down

0 comments on commit 324403b

Please sign in to comment.