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

Apply shellcheck advices

Browse source
This commit is contained in:
Julien Malik 2015-09-06 22:36:49 +02:00
parent 0b5ffbc9a7
commit 97234cfced
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
install_yunohostv2
View file

@ -48,7 +48,7 @@ $1
" 1>&2 " 1>&2
tput sgr 0 tput sgr 0
notify_about_install_logs notify_about_install_logs
exit ${2:-1} exit "${2:-1}"
} }
this_script_path() { this_script_path() {
@ -60,7 +60,7 @@ this_script_path() {
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
echo $DIR echo "$DIR"
} }
ensure_root() { ensure_root() {
@ -85,7 +85,7 @@ installscript_dependencies() {
-- \ -- \
apt-get -o Dpkg::Options::="--force-confold" \ apt-get -o Dpkg::Options::="--force-confold" \
-y install \ -y install \
$packages \ "$packages" \
|| return 2 || return 2
return 0 return 0
@ -148,7 +148,7 @@ setup_package_source() {
echo "deb http://repo.yunohost.org/ megusta main" > $CUSTOMAPT echo "deb http://repo.yunohost.org/ megusta main" > $CUSTOMAPT
# Also add repositories for 'testing' and/or 'unstable' if the script has been called with those arguments # Also add repositories for 'testing' and/or 'unstable' if the script has been called with those arguments
if [[ "$#" > "0" ]]; then if [[ "$#" -gt "0" ]]; then
if [[ "$1" == "test" ]] || [[ "$1" == "testing" ]] ; then if [[ "$1" == "test" ]] || [[ "$1" == "testing" ]] ; then
echo "deb http://repo.yunohost.org/ testing main" >> $CUSTOMAPT echo "deb http://repo.yunohost.org/ testing main" >> $CUSTOMAPT
fi fi
@ -172,9 +172,9 @@ apt_update() {
register_debconf() { register_debconf() {
if [[ $(lsb_release -c | awk '{print $2}') == jessie ]]; if [[ $(lsb_release -c | awk '{print $2}') == jessie ]];
then then
debconf-set-selections $(this_script_path)/debconfjessie debconf-set-selections "$(this_script_path)/debconfjessie"
else else
debconf-set-selections $(this_script_path)/debconfv2 debconf-set-selections "$(this_script_path)/debconfv2"
fi fi
} }
@ -199,10 +199,10 @@ workaround_avahi_installation() {
id avahi > /dev/null 2>&1 || return 0 id avahi > /dev/null 2>&1 || return 0
# Get a random unused uid between 500 and 999 (system-user) # Get a random unused uid between 500 and 999 (system-user)
local avahi_id=$((500 + $RANDOM % 500)) local avahi_id=$((500 + RANDOM % 500))
while ! cat /etc/passwd | cut -d ':' -f 3 | grep -q $avahi_id ; while ! cut -d ':' -f 3 /etc/passwd | grep -q $avahi_id ;
do do
avahi_id=$((500 + $RANDOM % 500)) avahi_id=$((500 + RANDOM % 500))
done done
# Use the same adduser parameter as in the avahi-daemon postinst script # Use the same adduser parameter as in the avahi-daemon postinst script