diff options
| -rwxr-xr-x | scripts/install.sh | 5 | ||||
| -rwxr-xr-x | src/get.sh | 7 | ||||
| -rw-r--r-- | src/remove.sh | 4 | ||||
| -rwxr-xr-x | src/xi.sh | 3 |
4 files changed, 10 insertions, 9 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index 0db895e..cf07e37 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,6 @@ #!/bin/sh -default_packages="base linux xipkg dracut grub bash" +default_packages="base linux-libre xipkg dracut grub bash" additional_packages="sudo neofetch vim networkmanager" default_key="davidovski https://xi.davidovski.xyz/keychain/xi.pub" @@ -30,7 +30,8 @@ echo "Please make sure that you have correctly formatted any partitions and moun } $XIPKG $XIFLAGS sync -$XIPKG $XIFLAGS -r $SYSROOT bootstrap $default_packages +$XIPKG $XIFLAGS -r $SYSROOT bootstrap +$XIPKG $XIFLAGS -r $SYSROOT install $default_packages $XIPKG $XIFLAGS -r $SYSROOT keyimport $default_key configuring_users () { @@ -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 |