YunoHost/cd_build
1
0
Fork 0
mirror of https://github.com/YunoHost/cd_build.git synced 2024-09-03 20:06:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Misc fixes from Aleks and Maniack ?

Browse source
This commit is contained in:
root 2018-04-28 21:45:36 +00:00
parent 7a36ea2e0e
commit 1e2556d028
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
auto_build.sh Normal file → Executable file
View file

@ -7,7 +7,7 @@ repo_url="http://repo.yunohost.org/debian/"
build_yunohost_org_dir="/var/www/build" build_yunohost_org_dir="/var/www/build"
iso_directory="$script_dir" iso_directory="/var/www/build"
old_iso_directory="$iso_directory/releases_archive" old_iso_directory="$iso_directory/releases_archive"
mkdir -p "$old_iso_directory" mkdir -p "$old_iso_directory"
@ -21,10 +21,10 @@ get_ynh_release () {
build_new_version () { build_new_version () {
local arch="$1" local arch="$1"
echo -e "\n$(date)" >> "$script_dir/ynh_build.log" echo -e "\n$(date)" >> "/var/log/build_yunohost/ynh_build.log"
echo ">>> Build a new iso for YunoHost $dist on $deb_dist $arch" | tee -a "$script_dir/ynh_build.log" echo ">>> Build a new iso for YunoHost $dist on $deb_dist $arch" | tee -a "/var/log/build_yunohost/ynh_build.log"
(cd "$script_dir" (cd "$script_dir"
./build-yunohost $arch $dist $deb_dist 2>&1 | tee -a "$script_dir/ynh_build.log" ./build-yunohost $arch $dist $deb_dist 2>&1 | tee -a "/var/log/build_yunohost/ynh_build.log"
) )
# Move the old iso in another directory # Move the old iso in another directory

11
build-yunohost
View file

@ -30,7 +30,7 @@ function build
fi fi
# Build a simple/regular debian CD image ? # Build a simple/regular debian CD image ?
build-simple-cdd --dist $DEB_DIST --conf ./simple-cdd-$ARCH.conf sudo -u yunohost build-simple-cdd --dist $DEB_DIST --conf ./simple-cdd-$ARCH.conf
# Find the release version of debian # Find the release version of debian
local DEBNUM="$(grep "Version:" tmp/${DEB_DIST}_Release | awk '{print $2;}')" local DEBNUM="$(grep "Version:" tmp/${DEB_DIST}_Release | awk '{print $2;}')"
@ -74,6 +74,9 @@ function sign
info "Signing image $NAME ..." info "Signing image $NAME ..."
# Remove previous signature to prevent gpg to ask about overwriting
rm -f $NAME.sig
sudo gpg --output $NAME.sig --detach-sig $NAME sudo gpg --output $NAME.sig --detach-sig $NAME
sha256sum $NAME > $NAME.sum sha256sum $NAME > $NAME.sum
} }
@ -88,14 +91,8 @@ function build_and_sign
sign $ARCH sign $ARCH
} }
function assert_not_root
{
[[ $EUID -ne 0 ]] || critical "You should not run this script as root !"
}
function main function main
{ {
assert_not_root
if [ -z "$ARCH_CHOICE" ] if [ -z "$ARCH_CHOICE" ]
then then