diff options
| author | madmonkey <madfkingmonkey@gmail.com> | 2017-02-14 22:15:15 +0300 |
|---|---|---|
| committer | madmonkey <madfkingmonkey@gmail.com> | 2017-02-14 22:15:15 +0300 |
| commit | 65131d9e1cf61fac3effb73e28861988d0145feb (patch) | |
| tree | a29edf3aae610f4441f5970c4da988a6ee9e5fc3 /mod | |
| parent | a370268420832fc194fee50dd90f16439f069956 (diff) | |
| parent | b2a5d684eec086c79c3eb919a8809a2a0f3f81ea (diff) | |
Merge branch 'master' of git://github.com/ClusterM/hakchi into ClusterM-master
Conflicts:
mod/hakchi/script/base
mod/hakchi/script/games
mod/hakchi/script/install
mod/hakchi/script/package
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/hakchi/rootfs/bin/chmenu (renamed from mod/hakchi/rootfs/usr/bin/chmenu) | 0 | ||||
| -rw-r--r-- | mod/hakchi/rootfs/bin/clover-kachikachi-wr (renamed from mod/hakchi/rootfs/usr/bin/clover-kachikachi-wr) | 0 | ||||
| -rw-r--r-- | mod/hakchi/script/games | 8 | ||||
| -rw-r--r-- | mod/hakchi/script/transfer | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/mod/hakchi/rootfs/usr/bin/chmenu b/mod/hakchi/rootfs/bin/chmenu index f333c26..f333c26 100644 --- a/mod/hakchi/rootfs/usr/bin/chmenu +++ b/mod/hakchi/rootfs/bin/chmenu diff --git a/mod/hakchi/rootfs/usr/bin/clover-kachikachi-wr b/mod/hakchi/rootfs/bin/clover-kachikachi-wr index 26b2996..26b2996 100644 --- a/mod/hakchi/rootfs/usr/bin/clover-kachikachi-wr +++ b/mod/hakchi/rootfs/bin/clover-kachikachi-wr diff --git a/mod/hakchi/script/games b/mod/hakchi/script/games index 598e6f9..7e59555 100644 --- a/mod/hakchi/script/games +++ b/mod/hakchi/script/games @@ -39,10 +39,10 @@ transfer_games(){ [ -d "$1" ] || return 1 target_dir=$rootfs/usr/share/games/nes/kachikachi # Flag to remove all installed games - if [ -f "$1/clean" ]; then + if [ -f "$1/clear" ]; then echo Removing games... rm -rf $target_dir/CLV-* - rm "$1/clean" + rm "$1/clear" fi mkdir -p "$target_dir" # But we need fonts @@ -51,5 +51,7 @@ transfer_games(){ transfer_original_games "$1/original" echo Transfering new games... # This is simple - copy "$1/CLV-*" "$target_dir" + copy "$1/*" "$target_dir" + # Need to reset menu state + rm -f $installpath/menu } diff --git a/mod/hakchi/script/transfer b/mod/hakchi/script/transfer index 144bda4..aefd1c4 100644 --- a/mod/hakchi/script/transfer +++ b/mod/hakchi/script/transfer @@ -27,7 +27,10 @@ if [ -d "$transferpath/hmod" ]; then rm -rf "$transferpath/hmod" fi -transfer_games "$transferpath/games" +if [ -d "$transferpath/games" ]; then + transfer_games "$transferpath/games" + rm -rf "$transferpath/games" +fi echo transferring data... transfer_path "$transferpath" |