From 1761437907dcd035c588b52f57d859a95a6bb99a Mon Sep 17 00:00:00 2001
From: Denis Pynkin <denis.pynkin@collabora.com>
Date: Fri, 5 Jan 2018 15:30:21 +0000
Subject: [PATCH] Remove bashisms from scripts
Scripts must be able to run in chrooted environment without
the `bash`. Remove call of internal `shopt` command and fix shebang.
Fixes T4475
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Reviewed-by: Emanuele Aina <emanuele.aina@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D7426
---
scripts/add-xdg-user-metadata.chroot | 4 +---
scripts/ostree-prepare.sh | 2 +-
scripts/setup_image_version.chroot | 5 +----
scripts/setup_sysroot.chroot | 5 +----
scripts/setup_user.chroot | 5 +----
5 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/scripts/add-xdg-user-metadata.chroot b/scripts/add-xdg-user-metadata.chroot
index 925b6d5..1d949f8 100755
--- a/scripts/add-xdg-user-metadata.chroot
+++ b/scripts/add-xdg-user-metadata.chroot
@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/bin/sh
set -e
-shopt -s dotglob > /dev/null 2>&1
# Hackish: Add user XDG metadata BUG: #1157
echo "I: Adding XDG user metadata."
@@ -10,4 +9,3 @@ mkdir -p /etc/skel/.local/{bin,etc,include,lib,libexec,share}
mkdir -p /root/{.config,.cache,.dbus}
mkdir -p /root/.local/{bin,etc,include,lib,libexec,share}
-shopt -u
diff --git a/scripts/ostree-prepare.sh b/scripts/ostree-prepare.sh
index 3bac545..87051fe 100755
--- a/scripts/ostree-prepare.sh
+++ b/scripts/ostree-prepare.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -e
diff --git a/scripts/setup_image_version.chroot b/scripts/setup_image_version.chroot
index 4120519..467089d 100755
--- a/scripts/setup_image_version.chroot
+++ b/scripts/setup_image_version.chroot
@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/bin/sh
set -e
-shopt -s dotglob
distro=$1
rel=$2
@@ -9,5 +8,3 @@ timestamp=$3
vendor=$4
echo "${distro} ${rel} ${timestamp} ${vendor}" > /etc/image_version
-
-shopt -u
diff --git a/scripts/setup_sysroot.chroot b/scripts/setup_sysroot.chroot
index 334f439..8707b43 100755
--- a/scripts/setup_sysroot.chroot
+++ b/scripts/setup_sysroot.chroot
@@ -1,12 +1,9 @@
-#!/bin/bash
+#!/bin/sh
set -e
-shopt -s dotglob
echo "I: create sysroot directory"
install -d -m 0755 /home/sysroot
chown user.user /home/sysroot
echo "I: link /opt/sysroot to sysroot directory"
ln -sf ../home/sysroot /opt/sysroot
-
-shopt -u
diff --git a/scripts/setup_user.chroot b/scripts/setup_user.chroot
index c6063ad..5764990 100755
--- a/scripts/setup_user.chroot
+++ b/scripts/setup_user.chroot
@@ -1,12 +1,9 @@
-#!/bin/bash
+#!/bin/sh
set -e
-shopt -s dotglob
echo "I: create user"
adduser --gecos User --disabled-login user
echo "I: set user password"
echo "user:user" | chpasswd
-
-shopt -u
--
GitLab