diff --git a/setup.sh b/setup.sh index 172423e..d638509 100644 --- a/setup.sh +++ b/setup.sh @@ -9,25 +9,24 @@ unset ${!setup_@} #---------------------------------------------------------------------- # Configuration ; folders and files to create/chown/copy... #---------------------------------------------------------------------- +# Directories to check ONLY with mkdir -p +setup_dir_bin="usr/local/bin" +# main app name +setup_app_name="upd" +# bin uri +set_bin_uri="$setup_dir_bin/$setup_app_name" + # Directories to CHOWN -R set_dir_R_CHO=( var/lib/upd etc/upd ) -# Directories to check ONLY with mkdir -p -setup_dir_bin="usr/local/bin" - -# main app name -setup_app_name="upd" # filename application to CHOWN + CHMOD 755 set_files_R_CHO=( upd ) -# bin uri -set_bin_uri="$setup_dir_bin/$setup_file_bin" - #====================================================================== #---------------------- @@ -133,12 +132,12 @@ printf '\n%b\n%b\n%b\n' \ # Updaate && Check Version setup_ins_version=` -awk 'NR==2 {print $3}' "/$setup_dir_bin/$setup_file_bin" 2>/dev/null` +awk 'NR==2 {print $3}' "/$set_bin_uri" 2>/dev/null` setup_new_version=` -awk 'NR==2 {print $3}' "$setup_dir_bin/$setup_file_bin" 2>/dev/null` +awk 'NR==2 {print $3}' "$set_bin_uri" 2>/dev/null` [[ "$setup_ins_version" == "$setup_new_version" ]] \ - && echo "$setup_file_bin is already up to date" \ + && echo "$setup_app_name is already up to date" \ && unset ${!setup_@} \ && exit 0 diff --git a/usr/local/bin/upd b/usr/local/bin/upd index 2b2a0e2..faa1875 100755 --- a/usr/local/bin/upd +++ b/usr/local/bin/upd @@ -1,5 +1,5 @@ #!/bin/bash -# version: 0.0.10 +# version: 0.0.11 # file: upd # Folder: /usr/local/bin # By echolib diff --git a/var/lib/upd/scripts/updater b/var/lib/upd/scripts/updater index 10dd240..07dac4e 100644 --- a/var/lib/upd/scripts/updater +++ b/var/lib/upd/scripts/updater @@ -22,7 +22,6 @@ else fi printf -v versions '%s\n%s' "$v_cur" "$v_onl" - [[ `sort -V <<< "$versions" | tail -1` == $v_cur ]] \ && return diff --git a/var/lib/upd/setup.sh b/var/lib/upd/setup.sh index 172423e..d638509 100644 --- a/var/lib/upd/setup.sh +++ b/var/lib/upd/setup.sh @@ -9,25 +9,24 @@ unset ${!setup_@} #---------------------------------------------------------------------- # Configuration ; folders and files to create/chown/copy... #---------------------------------------------------------------------- +# Directories to check ONLY with mkdir -p +setup_dir_bin="usr/local/bin" +# main app name +setup_app_name="upd" +# bin uri +set_bin_uri="$setup_dir_bin/$setup_app_name" + # Directories to CHOWN -R set_dir_R_CHO=( var/lib/upd etc/upd ) -# Directories to check ONLY with mkdir -p -setup_dir_bin="usr/local/bin" - -# main app name -setup_app_name="upd" # filename application to CHOWN + CHMOD 755 set_files_R_CHO=( upd ) -# bin uri -set_bin_uri="$setup_dir_bin/$setup_file_bin" - #====================================================================== #---------------------- @@ -133,12 +132,12 @@ printf '\n%b\n%b\n%b\n' \ # Updaate && Check Version setup_ins_version=` -awk 'NR==2 {print $3}' "/$setup_dir_bin/$setup_file_bin" 2>/dev/null` +awk 'NR==2 {print $3}' "/$set_bin_uri" 2>/dev/null` setup_new_version=` -awk 'NR==2 {print $3}' "$setup_dir_bin/$setup_file_bin" 2>/dev/null` +awk 'NR==2 {print $3}' "$set_bin_uri" 2>/dev/null` [[ "$setup_ins_version" == "$setup_new_version" ]] \ - && echo "$setup_file_bin is already up to date" \ + && echo "$setup_app_name is already up to date" \ && unset ${!setup_@} \ && exit 0