Commit 1509e510 authored by Vivien Alger's avatar Vivien Alger

End of file 4th try

parent 440042bd
...@@ -48,12 +48,16 @@ function spec_generation ...@@ -48,12 +48,16 @@ function spec_generation
cat $RPM_DIRECTORY/post >> $SLAPOS_SPEC cat $RPM_DIRECTORY/post >> $SLAPOS_SPEC
# Preun scriplet generation # Preun scriplet generation
echo "%preun" >> $SLAPOS_SPEC echo "
%preun" >> $SLAPOS_SPEC
cat $RPM_DIRECTORY/preun >> $SLAPOS_SPEC cat $RPM_DIRECTORY/preun >> $SLAPOS_SPEC
# Postun scriplet generation # Postun scriplet generation
echo "%postun" >> $SLAPOS_SPEC echo "
%postun" >> $SLAPOS_SPEC
cat $RPM_DIRECTORY/postun >> $SLAPOS_SPEC cat $RPM_DIRECTORY/postun >> $SLAPOS_SPEC
echo "
" >> $SLAPOS_SPEC
} }
function prepare_deb_packaging function prepare_deb_packaging
...@@ -119,22 +123,22 @@ if [ ! -d "$CURRENT_DIRECTORY/$SLAPOS_DIRECTORY" ]; then ...@@ -119,22 +123,22 @@ if [ ! -d "$CURRENT_DIRECTORY/$SLAPOS_DIRECTORY" ]; then
fi fi
# Prepare Makefile and offline script # Prepare Makefile and offline script
prepare_template_files #prepare_template_files
# Prepare Download Cache for SlapOS # Prepare Download Cache for SlapOS
prepare_download_cache #prepare_download_cache
# Prepare tarball # Prepare tarball
prepare_tarball #prepare_tarball
# Generate spec file # Generate spec file
spec_generation spec_generation
# Prepare deb packaging # Prepare deb packaging
prepare_deb_packaging #prepare_deb_packaging
# Upload to obs # Upload to obs
obs_upload #obs_upload
# Save current version # Save current version
echo "$RECIPE_VERSION" > $CURRENT_DIRECTORY/slapos-recipe-version echo "$RECIPE_VERSION" > $CURRENT_DIRECTORY/slapos-recipe-version
......
...@@ -2,4 +2,4 @@ echo """To generate slapos configuration run '#slapos node register'""" ...@@ -2,4 +2,4 @@ echo """To generate slapos configuration run '#slapos node register'"""
if [ -f /bin/systemctl ]; then if [ -f /bin/systemctl ]; then
systemctl enable slapos-node.service systemctl enable slapos-node.service
systemctl start slapos-node.service systemctl start slapos-node.service
fi fi
\ No newline at end of file
if [ -f /bin/systemctl ]; then if [ -f /bin/systemctl ]; then
systemctl restart slapos-node.service systemctl restart slapos-node.service
fi fi
\ No newline at end of file
if [ -f /bin/systemctl ]; then if [ -f /bin/systemctl ]; then
systemctl stop slapos-node.service systemctl stop slapos-node.service
fi fi
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment