diff --git a/scripts/add-xdg-user-metadata.chroot b/scripts/add-xdg-user-metadata.chroot index 925b6d5a5acb2ec17e237a51ac7918d0b57443c3..1d949f8b064474d57ce90adc20b61599c1cac9cd 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 3bac545a908af17b1db1901d27bdbf46d1132686..87051feb59138487f957bffcaca3e914324c55a4 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 41205199c75b6b6644586aa25bb82c21b4d8fb0b..467089d0cbeaab173d36247eccec69bb9edb0cc9 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 334f4393672257b4b4dcc3ad18c2316767f2c3d6..8707b4366801464b644398b5b2bd58115f9378a9 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 c6063adcdf61ae211e8fd3e29b762892fc9c3f78..576499008a84dadb3a007654541254da81fd6f74 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