xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[Modify the use of sudo commands]

This commit is contained in:
plum-lihui 2019-07-19 15:39:34 +08:00
parent c92fa53bd5
commit ead54e4a5a
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packaging/release.sh
View File

@ -10,6 +10,11 @@ script_dir="$(dirname $(readlink -f $0))"
top_dir="$(readlink -m ${script_dir}/..)" top_dir="$(readlink -m ${script_dir}/..)"
versioninfo="${top_dir}/src/util/src/version.c" versioninfo="${top_dir}/src/util/src/version.c"
csudo=""
if command -v sudo > /dev/null; then
csudo="sudo"
fi
function is_valid_version() { function is_valid_version() {
[ -z $1 ] && return 1 || : [ -z $1 ] && return 1 || :
@ -113,13 +118,13 @@ fi
compile_dir="${top_dir}/${compile_mode}" compile_dir="${top_dir}/${compile_mode}"
if [ -d ${compile_dir} ]; then if [ -d ${compile_dir} ]; then
rm -rf ${compile_dir} ${csudo} rm -rf ${compile_dir}
fi fi
mkdir -p ${compile_dir} ${csudo} mkdir -p ${compile_dir}
cd ${compile_dir} cd ${compile_dir}
cmake -DCMAKE_BUILD_TYPE=${compile_mode} ${top_dir} ${csudo} cmake -DCMAKE_BUILD_TYPE=${compile_mode} ${top_dir}
make ${csudo} make
cd ${curr_dir} cd ${curr_dir}
@ -132,29 +137,29 @@ if echo $osinfo | grep -qwi "ubuntu" ; then
echo "this is ubuntu system" echo "this is ubuntu system"
output_dir="${top_dir}/debs" output_dir="${top_dir}/debs"
if [ -d ${output_dir} ]; then if [ -d ${output_dir} ]; then
rm -rf ${output_dir} ${csudo} rm -rf ${output_dir}
fi fi
mkdir -p ${output_dir} ${csudo} mkdir -p ${output_dir}
cd ${script_dir}/deb cd ${script_dir}/deb
./makedeb.sh ${compile_dir} ${output_dir} ${version} ${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${version}
elif echo $osinfo | grep -qwi "centos" ; then elif echo $osinfo | grep -qwi "centos" ; then
echo "this is centos system" echo "this is centos system"
output_dir="${top_dir}/rpms" output_dir="${top_dir}/rpms"
if [ -d ${output_dir} ]; then if [ -d ${output_dir} ]; then
rm -rf ${output_dir} ${csudo} rm -rf ${output_dir}
fi fi
mkdir -p ${output_dir} ${csudo} mkdir -p ${output_dir}
cd ${script_dir}/rpm cd ${script_dir}/rpm
./makerpm.sh ${compile_dir} ${output_dir} ${version} ${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${version}
else else
echo "this is other linux system" echo "this is other linux system"
fi fi
cd ${script_dir}/tools cd ${script_dir}/tools
./makepkg.sh ${compile_dir} ${version} "${build_time}" ${csudo} ./makepkg.sh ${compile_dir} ${version} "${build_time}"
# 4. Clean up temporary compile directories # 4. Clean up temporary compile directories
#rm -rf ${compile_dir} #${csudo} rm -rf ${compile_dir}