Merge pull request #13 from RandomCoderOrg/build-template-fix

Build template fix [ stage 1 ]

Author: SaicharanKandukuri

CONTRIBUTING.md

@@ -39,9 +39,9 @@ contains functions that can be used for cmd line building and integrating in scr
 do_mount "/path/to/fs"
 ```
 
-<kbd>do_debootstrap()</kbd> bootstraps linux to a directories of specified arch
+<kbd>do_build()</kbd> bootstraps linux to a directories of specified arch
 ```bash
-do_debootstrap "out/udroid-test" "arm64"
+do_build "out/udroid-test" "arm64"
 ```
 ###### TODO ( need to write more )
 
@@ -51,7 +51,7 @@ do_debootstrap "out/udroid-test" "arm64"
 ```bash
 source plugins/envsetup
 SUITE=impish
-do_debootstrap "out/fs" "arm64"
+do_build "out/fs" "arm64"
 ```
 ### Quick build scripts
 - `build-impish-raw.sh`: to build raw ubuntu 21.10 tarballs
@@ -70,7 +70,7 @@ do_debootstrap "out/fs" "arm64"
 - `no_to_directory()`: exits if directory given is present
 - `foreign_arch()`: checks does target arch matches with host architecture
 - `includes_packages()`: takes care of extrapackges when a variable `INCLUDE_PACKAGES` is set with packages
-- `do_debootstrap()`: bootstraps linux to with target arch to target directorie
+- `do_build()`: bootstraps linux to with target arch to target directorie
 - `do_second_stage()`: if foreign arch triggers second stage
 - - `do_qemu_user_emulation()` sets up qemu binaries in chroot
 - `do_chroot_ae()`: to run command in chroot

build-impish-raw.sh

@@ -32,11 +32,11 @@ additional_setup() {
     install_pkg "lz4 bzip2 gzip bc pv"
 }
 
-do_debootstrap "${frn}-arm64" arm64
+do_build "${frn}-arm64" arm64
 do_compress    "${frn}-arm64"
-do_debootstrap "${frn}-armhf" armhf
+do_build "${frn}-armhf" armhf
 do_compress    "${frn}-armhf"
-do_debootstrap "${frn}-amd64" amd64
+do_build "${frn}-amd64" amd64
 do_compress    "${frn}-amd64"
 
 do_unmount "${frn}-arm64"

build-kali-raw.sh

@@ -35,11 +35,11 @@ ENABLE_USER_SETUP=false
 
 warn "for best results use kali-linux host for building"
 
-do_debootstrap "${frn}-arm64" arm64
+do_build "${frn}-arm64" arm64
 do_compress    "${frn}-arm64"
-do_debootstrap "${frn}-armhf" armhf
+do_build "${frn}-armhf" armhf
 do_compress    "${frn}-armhf"
-do_debootstrap "${frn}-amd64" amd64
+do_build "${frn}-amd64" amd64
 do_compress    "${frn}-amd64"
 
 do_unmount "${frn}-arm64"

build/mate/build.sh

@@ -48,7 +48,7 @@ function stage_one() {
     for _arch in ${BUILD_ARCH}; do
         export _arch
         msg "+ building ${_arch}"
-        do_debootstrap "${OUT_DIR}-${_arch}" "$_arch" || exit 1
+        do_build "${OUT_DIR}-${_arch}" "$_arch" || exit 1
         second_stage
     done
 }

build/raw/build-hirsute-raw.sh

@@ -16,9 +16,9 @@ frn="out/hirsute-raw"
 OVERRIDER_COMPRESSION_TYPE="gzip"
 ENABLE_EXIT=true
 
-do_debootstrap "${frn}-arm64" arm64
+do_build "${frn}-arm64" arm64
 do_compress    "${frn}-arm64"
-do_debootstrap "${frn}-armhf" armhf
+do_build "${frn}-armhf" armhf
 do_compress    "${frn}-armhf"
-do_debootstrap "${frn}-amd64" amd64
+do_build "${frn}-amd64" amd64
 do_compress    "${frn}-amd64"

cook.sh

@@ -18,11 +18,11 @@ OVERRIDER_COMPRESSION_TYPE="gzip"
 ENABLE_EXIT=true
 ENABLE_USER_SETUP=false
 
-do_debootstrap "${frn}-arm64" arm64
+do_build "${frn}-arm64" arm64
 do_compress    "${frn}-arm64"
-do_debootstrap "${frn}-armhf" armhf
+do_build "${frn}-armhf" armhf
 do_compress    "${frn}-armhf"
-do_debootstrap "${frn}-amd64" amd64
+do_build "${frn}-amd64" amd64
 do_compress    "${frn}-amd64"
 
 do_unmount "${frn}-arm64"

plugins/envsetup

@@ -2,9 +2,9 @@
 
 ################################
 # MIT License
-# 
+#
 # Copyright (c) 2021 RandomCoderOrg,Saicharankandkuri <[email protected]>
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
@@ -14,7 +14,7 @@
 # 
 # The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -61,6 +61,12 @@ msg() {
 }
 # lshout () { echo -e "${*}";:; }
 
+trim_quotes() {
+    # Usage: trim_quotes "string"
+    : "${1//\'}"
+    printf '%s\n' "${_//\"}"
+}
+
 do_mount() {
     local chroot_dir=$1
     points="$chroot_dir/dev $chroot_dir/sys $chroot_dir/proc"
@@ -220,7 +226,7 @@ includes_packages() {
     shout "$x includes processed "
 }
 
-do_debootstrap() {
+do_build() {
     export target_dir="$1"
     export arch="$2"
 
@@ -298,70 +304,6 @@ do_debootstrap() {
     fi
 }
 
-setup_user()
-{     
-    default_uid=1001
-    default_gid=1001
-
-        if [ -n "$FS_USER" ]; then
-        _user=$FS_USER
-    else
-        warn "username not set in \$\"FS_USER\""
-        msg "defaulting to ${USER}01"
-        _user="${USER}01"
-    fi
-
-    if [ -n "$FS_PASSWD" ]; then
-        _passwd=$FS_PASSWD
-    else
-        _passwd="fs-cook-${RANDOM}"
-        warn "password not set in \$\"FS_PASSWD\""
-        msg "defaulting to $_passwd"
-    fi
-
-    # SUDO setup
-    if ! $ENABLE_PASSWD; then
-        pass_set_cmd="echo $_user ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$_user;chmod 0440 /etc/sudoers.d/$_user"
-    else
-        pass_set_cmd="echo $_user ALL=\(root\) ALL > /etc/sudoers.d/$_user;chmod 0440 /etc/sudoers.d/$_user"
-    fi
-
-    # UID setup
-    if [ -n "$FS_UID" ]; then
-        uid_val="$FS_UID"
-    else
-        uid_val="$default_uid"
-    fi
-
-    # GID setup
-    if [ -n "$FS_GID" ]; then
-        gid_val="$FS_GID"
-    else
-        gid_val="$default_gid"
-    fi
-
-    shout "setting up $_user..."
-    
-    # create user group
-    run_cmd "groupadd --gid 1001 $_user"
-
-    # create user
-    CMD="useradd -m \
-    -p \$\(openssl passwd -1 $_passwd\) \
-    -G sudo \
-    -d /home/$_user \
-    -g $gid_val \
-    -u $uid_val \
-    -k /etc/skel \
-    -s /bin/bash \
-    $_user"
-
-    run_cmd "apt update"
-    install_pkg "openssl"   
-    run_cmd "$CMD"
-    run_cmd "$pass_set_cmd"
-
-}
 arch_translate() {
     arch=$1
     export t_arch
@@ -406,7 +348,7 @@ do_qemu_user_emulation() {
 }
 
 do_chroot_ae() {
-    local chroot_dir="$1"
+    local chroot_dir=$1
     shift
     local command=$*
     do_mount "$chroot_dir"