diff --git a/x230/build.sh b/x230/build.sh index 296eb36..b1ad4ae 100755 --- a/x230/build.sh +++ b/x230/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -. skulls_common.sh +source functions.sh warn_not_root diff --git a/x230/skulls_common.sh b/x230/functions.sh similarity index 100% rename from x230/skulls_common.sh rename to x230/functions.sh diff --git a/x230/release.sh b/x230/release.sh index 30d1bd2..7cb8f72 100755 --- a/x230/release.sh +++ b/x230/release.sh @@ -132,7 +132,7 @@ sha256sum ${RELEASE_DIR}/${RELEASE_IMAGE_FILE_2} > "${RELEASE_DIR}/${RELEASE_IMA cp ../SOURCE.md "$RELEASE_DIR" # copy in x230 stuff -cp -a README.md NEWS util LICENSE* skulls_common.sh \ +cp -a README.md NEWS util LICENSE* functions.sh \ x230_before_first_install.sh x230_skulls.sh x230_heads.sh \ external_install_bottom.sh external_install_top.sh \ upgrade.sh \ diff --git a/x230/upgrade.sh b/x230/upgrade.sh index 5aeb7d2..1cb7bf4 100755 --- a/x230/upgrade.sh +++ b/x230/upgrade.sh @@ -7,7 +7,7 @@ NC='\033[0m' set -e -. skulls_common.sh +source functions.sh usage() { diff --git a/x230/x230_before_first_install.sh b/x230/x230_before_first_install.sh index d495263..f28194c 100755 --- a/x230/x230_before_first_install.sh +++ b/x230/x230_before_first_install.sh @@ -5,7 +5,7 @@ RED='\033[0;31m' GREEN='\033[0;32m' NC='\033[0m' -. skulls_common.sh +source functions.sh set -e usage() diff --git a/x230/x230_heads.sh b/x230/x230_heads.sh index 64866e4..52894a8 100755 --- a/x230/x230_heads.sh +++ b/x230/x230_heads.sh @@ -8,7 +8,7 @@ NC='\033[0m' set -e -. skulls_common.sh +source functions.sh have_input_image=0 diff --git a/x230/x230_skulls.sh b/x230/x230_skulls.sh index d461485..da0b537 100755 --- a/x230/x230_skulls.sh +++ b/x230/x230_skulls.sh @@ -8,7 +8,7 @@ NC='\033[0m' set -e -. skulls_common.sh +source functions.sh have_input_image=0