Merge pull request #71 from essentialkaos/develop

Version 1.10.2

SOURCES/rbbuild

@@ -13,7 +13,7 @@ fi
 APP="RBBuild"
 
 # App version (String)
-VER="1.10.1"
+VER="1.10.2"
 
 ################################################################################
 
@@ -208,16 +208,10 @@ main() {
 
   [[ -n "$quiet" ]] && output=/dev/null
   [[ -n "$verbose" ]] && verb_output=$output
-
-  if [[ -d "$tmp" ]] ; then
-    if ! checkPerms "DRW" "$tmp" ; then
-      error "\nYou don't have enough permissions to use directory $tmp\n"
-      doExit 1
-    fi
-  fi
-
   [[ -n "$rbenv" ]] && require "rbenv"
 
+  checkTMPDir
+
   tmp_dir=$(mktemp -d ${tmp}/$TEMP_TEMPLATE)
   log="${tmp_dir}/build.log"
 
@@ -257,6 +251,34 @@ configureProxy() {
   fi
 }
 
+# Check temporary directory for problems
+#
+# Code: No
+# Echo: No
+checkTMPDir() {
+  if [[ -d "$tmp" ]] ; then
+    if ! checkPerms "DRW" "$tmp" ; then
+      error "\nYou don't have enough permissions to use directory $tmp\n"
+      doExit 1
+    fi
+  fi
+
+  local exec_output
+
+  echo -e "#!/usr/bin/env bash\necho 1\n" > "$tmp/rbbuild-exec-check.sh"
+  chmod 0700 "$tmp/rbbuild-exec-check.sh"
+
+  exec_output=$($tmp/rbbuild-exec-check.sh 2>/dev/null)
+
+  rm -f "$tmp/rbbuild-exec-check.sh" &> /dev/null
+
+  if [[ -z "$exec_output" ]] ; then
+    error "\nCan't execute the script inside of the temporary directory ($tmp)."
+    error "Directory mounted with noexec option?\n"
+    doExit 1
+  fi
+}
+
 # Prepare def file
 #
 # 1: Path to local or remote def file (String)

rbbuild.spec

@@ -29,7 +29,7 @@
 
 Summary:         Utility for compiling and installing different ruby versions
 Name:            rbbuild
-Version:         1.10.1
+Version:         1.10.2
 Release:         0%{?dist}
 License:         EKOL
 Vendor:          ESSENTIALKAOS
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Tue Jun 30 2020 Anton Novojilov <andy@essentialkaos.com> - 1.10.2-0
+- Added check for noexec flag for temporary directory
+
 * Fri Jun 19 2020 Anton Novojilov <andy@essentialkaos.com> - 1.10.1-0
 - Improved TruffleRuby builder