diff options
| author | davidovski <david@davidovski.xyz> | 2022-06-06 21:19:39 +0000 | 
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-06-06 21:19:39 +0000 | 
| commit | 9e7e6c466e0dab3a4bf3729fd97428dc2657746e (patch) | |
| tree | ccaa4790edce068e1874f93a1b9fd069fae61202 /src | |
| parent | dd8004ccbf58b546f48205d2878d9101bbfcaadc (diff) | |
fixed install scriptv1.5.6
Diffstat (limited to 'src')
| -rwxr-xr-x | src/get.sh | 7 | ||||
| -rw-r--r-- | src/remove.sh | 4 | ||||
| -rwxr-xr-x | src/xi.sh | 3 | 
3 files changed, 7 insertions, 7 deletions
| @@ -50,7 +50,7 @@ resolve_deps () {          ${QUIET} || hbar -T "${CHECKMARK} resolving dependencies" $i $((i + $#))      done -    ${QUIET} || hbar -t ${HBAR_COMPLETE} -T "${CHECKMARK} resolved dependencies" $i $((i + $#)) +    ${QUIET} || hbar -t ${HBAR_COMPLETE} -T "${CHECKMARK} resolved dependencies" $i $((i + $#))       echo ${deps} > $out  } @@ -78,9 +78,8 @@ get_installed_version () {          cat $file  } -# bad implementation  package_exists () { -    [ "$(find ${PACKAGES_DIR} -mindepth 1 -name "$1" | wc -l)" != "0" ] +    [ -f "${PACKAGES_DIR}/$1" ]  }  download_package () { @@ -161,7 +160,7 @@ get () {      [ "$#" = "0" ] && return 0      $DO_SYNC && sync - +       touch $out      resolve_deps $out $@ diff --git a/src/remove.sh b/src/remove.sh index 56b6a42..ae5b58a 100644 --- a/src/remove.sh +++ b/src/remove.sh @@ -20,13 +20,13 @@ remove () {              echo $package_dir >> $to_remove               real="$real $package"          else -            >&2 printf "${RED}Package ${LIGHT_RED}$package${RED} is not installed" +            printf "${RED}Package ${LIGHT_RED}$package${RED} is not installed\n" > /dev/stderr          fi      done      local total=$(cat $to_remove | wc -l) -    ${QUIET} || printf "${LIGHT_RED}The following packages will be removed from the system:\n\t${RED}%s\n" $real +    ${QUIET} || printf "${LIGHT_RED}The following packages will be removed from the system:\n\t${RED}$real\n"       ${QUIET} || printf "${LIGHT_RED}Files to remove: ${RED}%s\n" $total      ${VERBOSE} && cat $to_remove @@ -187,7 +187,8 @@ else          "reinstall")              shift              checkroot -            reinstall $@ +            $0 remove $@ +            $0 install $@              ;;          "files")              shift | 
