From 7d45d8b0ebc336c14e6a2e0289cca0c2595b7fd2 Mon Sep 17 00:00:00 2001
From: Ed Reel <edreel@gmail.com>
Date: Tue, 27 Jul 2021 21:57:12 -0500
Subject: [PATCH] Fix incorrect HOME constant value (#5997)

---
 lib/const.rb | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/const.rb b/lib/const.rb
index e4f4aa9c0..6de37acf5 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -1,6 +1,6 @@
 # Defines common constants used in different parts of crew
 
-CREW_VERSION = '1.14.0'
+CREW_VERSION = '1.15.0'
 
 ARCH_ACTUAL = `uname -m`.strip
 # This helps with virtualized builds on aarch64 machines
@@ -15,12 +15,14 @@ ARCH_LIB = if ARCH == 'x86_64' and Dir.exist?('/lib64') then 'lib64' else 'lib'
 @libcvertokens=  %x[/#{ARCH_LIB}/libc.so.6].lines.first.chomp.split(/[\s]/)
 LIBC_VERSION = @libcvertokens[@libcvertokens.find_index("version") + 1].sub!(/[[:punct:]]?$/,'')
 
-CREW_BUILD_FROM_SOURCE = ENV['CREW_BUILD_FROM_SOURCE']
-
-CREW_PREFIX = '/usr/local'
-if ENV['CREW_PREFIX'] and ENV['CREW_PREFIX'] != CREW_PREFIX
-  CREW_PREFIX = ENV['CREW_PREFIX']
+if ENV['CREW_PREFIX'] and ENV['CREW_PREFIX'] != '' and ENV['CREW_PREFIX'] != '/usr/local'
   CREW_BUILD_FROM_SOURCE = 1
+  CREW_PREFIX = ENV['CREW_PREFIX']
+  HOME = CREW_PREFIX + ENV['HOME']
+else
+  CREW_BUILD_FROM_SOURCE = ENV['CREW_BUILD_FROM_SOURCE']
+  CREW_PREFIX = '/usr/local'
+  HOME = ENV['HOME']
 end
 
 CREW_LIB_PREFIX = CREW_PREFIX + '/' + ARCH_LIB
@@ -35,12 +37,6 @@ CREW_DEST_PREFIX = CREW_DEST_DIR + CREW_PREFIX
 CREW_DEST_LIB_PREFIX = CREW_DEST_DIR + CREW_LIB_PREFIX
 CREW_DEST_MAN_PREFIX = CREW_DEST_DIR + CREW_MAN_PREFIX
 
-if ENV['CREW_PREFIX'].to_s.empty?
-  HOME = ENV['HOME']
-else
-  HOME = CREW_PREFIX + ENV['HOME']
-end
-
 CREW_DEST_HOME = CREW_DEST_DIR + HOME
 
 # File.join ensures a trailing slash if one does not exist.