diff options
| author | madmonkey1907 <madfkingmonkey@gmail.com> | 2017-02-15 20:07:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 20:07:34 +0300 |
| commit | 14bca53f8ac0a2e618db04ba08f3201a70e59d83 (patch) | |
| tree | af776cb60429e95c8d25dc4ae6e1e37bca9e9af9 | |
| parent | 8073c8bfc0a404aae7ed663baf5881a0e5959971 (diff) | |
| parent | 85bbd19b3152579ddcbe29bab6a180413941b2ca (diff) | |
Merge pull request #21 from ClusterM/master
Fixes
| -rw-r--r-- | mod/hakchi/script/package | 3 | ||||
| -rw-r--r-- | mod/hakchi/script/transfer | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mod/hakchi/script/package b/mod/hakchi/script/package index 5a7dde4..0ca3a8a 100644 --- a/mod/hakchi/script/package +++ b/mod/hakchi/script/package @@ -90,12 +90,11 @@ packs_install(){ [ -d "$1" ] || return 1 for i in $(find "$1" -maxdepth 1 -name "*.hmod" | sort); do pack_install "$i" - rm -rf "$1" + rm -rf "$i" done } packs_uninstall(){ - [ -d "$1" ] || return 1 for i in $@; do pack_uninstall "$i" done diff --git a/mod/hakchi/script/transfer b/mod/hakchi/script/transfer index d92ab1a..f7839d2 100644 --- a/mod/hakchi/script/transfer +++ b/mod/hakchi/script/transfer @@ -23,8 +23,8 @@ source "$preinitpath/p7070_firmware" local transferpath=$modpath/transfer -[ -f "$transferpath/uninstall" ] && packs_uninstall $(cat "$transferpath/uninstall") -[ -f "$transferpath/hmod/uninstall" ] && packs_uninstall $(cat "$transferpath/hmod/uninstall") +[ -f "$transferpath/uninstall" ] && packs_uninstall $(cat "$transferpath/uninstall") && rm -f $transferpath/uninstall +[ -f "$transferpath/hmod/uninstall" ] && packs_uninstall $(cat "$transferpath/hmod/uninstall") && rm -f $transferpath/hmod/uninstall packs_install "$transferpath" if [ -d "$transferpath/hmod" ]; then |