Changeset 58351 in vbox

Timestamp:

Oct 21, 2015 8:59:00 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103554

Message:

Installer/linux (guest): get rid of more auto-generation.

Location:

trunk/src/VBox

Files:

• Additions/Makefile.kmk (modified) (1 diff)
• Additions/linux/installer/autorun.sh (modified) (1 diff)
• Installer/linux/runasroot.sh (modified) (1 diff)

trunk/src/VBox/Additions/Makefile.kmk

@@ -76 +76 @@
 
  ifeq ($(KBUILD_TARGET),linux)
+
   INSTALLS += LnxAddIso-scripts
   LnxAddIso-scripts_INST    = $(INST_ADDITIONS)
   LnxAddIso-scripts_MODE    = a+rx,u+w
   LnxAddIso-scripts_SOURCES = \
-        $(LnxAddIso-scripts_0_OUTDIR)/runasroot.sh \
-        $(LnxAddIso-scripts_0_OUTDIR)/autorun.sh
-  LnxAddIso-scripts_CLEAN = \
-        $(LnxAddIso-scripts_0_OUTDIR)/runasroot.sh \
-        $(LnxAddIso-scripts_0_OUTDIR)/autorun.sh
-
-  $$(LnxAddIso-scripts_0_OUTDIR)/runasroot.sh: \
-                $(PATH_SUB_CURRENT)/../Installer/linux/runasroot.sh \
-                $(PATH_SUB_CURRENT)/../Installer/linux/sh-utils.sh \
-                | $$(dir $$@)
-        $(QUIET)$(SED) \
-                -e '/#include sh-utils.sh/ {' \
-                -e "r $(PATH_ROOT)/src/VBox/Installer/linux/sh-utils.sh" \
-                -e 'd' \
-                -e '}' \
-                --output $@ \
-                $<
-        $(QUIET)$(CHMOD) a+rx,u+w $@
-
-  $$(LnxAddIso-scripts_0_OUTDIR)/autorun.sh: \
-                $(PATH_SUB_CURRENT)/linux/installer/autorun.sh \
-                $(PATH_SUB_CURRENT)/../Installer/linux/sh-utils.sh \
-                | $$(dir $$@)
-        $(QUIET)$(SED) \
-                -e '/#include sh-utils.sh/ {' \
-                -e "r $(PATH_ROOT)/src/VBox/Installer/linux/sh-utils.sh" \
-                -e 'd' \
-                -e '}' \
-                --output $@ \
-                $<
-        $(QUIET)$(CHMOD) a+rx,u+w $@
+                ../Installer/linux/runasroot.sh \
+                linux/installer/autorun.sh
+
  endif # KBUILD_TARGET == linux
  ifeq ($(KBUILD_TARGET),win)

trunk/src/VBox/Additions/linux/installer/autorun.sh

@@ -19 +19 @@
 PATH=$PATH:/bin:/sbin:/usr/sbin
 
-#include sh-utils.sh
+# Deal with differing "which" semantics
+mywhich() {
+    which "$1" 2>/dev/null | grep -v "no $1"
+}
+
+# Get the name and execute switch for a useful terminal emulator
+#
+# Sets $gxtpath to the emulator path or empty
+# Sets $gxttitle to the "title" switch for that emulator
+# Sets $gxtexec to the "execute" switch for that emulator
+# May clobber $gtx*
+# Calls mywhich
+getxterm() {
+    # gnome-terminal uses -e differently to other emulators
+    for gxti in "konsole --title -e" "gnome-terminal --title -x" "xterm -T -e"; do
+        set $gxti
+        gxtpath="`mywhich $1`"
+        case "$gxtpath" in ?*)
+            gxttitle=$2
+            gxtexec=$3
+            return
+            ;;
+        esac
+    done
+}
+
+# Quotes its argument by inserting '\' in front of every character save
+# for 'A-Za-z0-9/'.  Prints the result to stdout.
+quotify() {
+    echo "$1" | sed -e 's/\([^a-zA-Z0-9/]\)/\\\1/g'
+}
 
 ostype=`uname -s`

trunk/src/VBox/Installer/linux/runasroot.sh

@@ -17 +17 @@
 #
 
-#include sh-utils.sh
+# Deal with differing "which" semantics
+mywhich() {
+    which "$1" 2>/dev/null | grep -v "no $1"
+}
+
+# Get the name and execute switch for a useful terminal emulator
+#
+# Sets $gxtpath to the emulator path or empty
+# Sets $gxttitle to the "title" switch for that emulator
+# Sets $gxtexec to the "execute" switch for that emulator
+# May clobber $gtx*
+# Calls mywhich
+getxterm() {
+    # gnome-terminal uses -e differently to other emulators
+    for gxti in "konsole --title -e" "gnome-terminal --title -x" "xterm -T -e"; do
+        set $gxti
+        gxtpath="`mywhich $1`"
+        case "$gxtpath" in ?*)
+            gxttitle=$2
+            gxtexec=$3
+            return
+            ;;
+        esac
+    done
+}
+
+# Quotes its argument by inserting '\' in front of every character save
+# for 'A-Za-z0-9/'.  Prints the result to stdout.
+quotify() {
+    echo "$1" | sed -e 's/\([^a-zA-Z0-9/]\)/\\\1/g'
+}
 
 ostype=`uname -s`