search

RetroPie / RetroPie-Setup

Shell script to set up a Raspberry Pi/Odroid/PC with RetroArch emulator and various cores
Other
10.03k stars 1.38k forks source link

Updating retropie setup script gives error: The following untracked working tree files would be overwritten by merge: #715

Closed jens-b closed 9 years ago

jens-b commented 9 years ago

Updating 3e2524b..2204ef7 error: The following untracked working tree files would be overwritten by merge: scriptmodules/admin/setup.sh scriptmodules/libretrocores/snes9x-next.sh scriptmodules/supplementary/retropiemenu.sh Please move or remove them before you can merge. Aborting

??

joolswills commented 9 years ago

odd if you haven't changed anything - you didn't add/update with any other method at some point to get the newer files?. you can do as it suggests and delete them if you don't have any changes you need.

gizmo98 commented 9 years ago

Try to stash every change with "sudo git stash" and run retropie_setup.sh again.

petrockblog commented 9 years ago

I do not see that this is a bug of the RetroPie-Setup Script.

joolswills commented 9 years ago

it isn't really - more of a support request imho - definitely better suited for the forum. closing.

scarlion1 commented 7 years ago

I'm getting the same error trying to update from 4.1 to 4.2, although the files mentioned are different and there's like 30 of them. I haven't changed any of these files. See below for file listing. I started renaming some to .old and it looks like they are timestamped March 19, which might be when I installed 4.1 fresh from an image. All the files below with a stamp of "Mar 19" are the ones mentioned in the error. Running git stash from Retropie-Setup dir returns "No local changes to save"

pi@retropie:~/RetroPie-Setup $ ls -laR
.:
total 96
drwxr-xr-x 8 pi pi  4096 Apr  2 01:00 .
drwxr-xr-x 6 pi pi  4096 Apr  2 01:09 ..
-rw-r--r-- 1 pi pi   146 Nov  5 21:01 AUTHORS
-rw-r--r-- 1 pi pi   421 Nov  5 21:01 CONTRIBUTING.md
-rw-r--r-- 1 pi pi   635 Nov  5 21:01 COPYRIGHT.md
drwxr-xr-x 8 pi pi  4096 Apr  2 01:09 .git
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 .github
-rw-r--r-- 1 pi pi   155 Nov  5 21:01 .gitignore
-rw-r--r-- 1 pi pi 32265 Nov  5 21:01 LICENSE.md
drwxr-xr-x 2 pi pi  4096 Apr  2 01:05 logs
-rw-r--r-- 1 pi pi  3797 Nov  5 21:01 platforms.cfg
-rw-r--r-- 1 pi pi  1925 Nov  5 21:01 README.md
-rwxr-xr-x 1 pi pi  1713 Nov  5 21:01 retropie_packages.sh
-rwxr-xr-x 1 pi pi   796 Nov  5 21:01 retropie_setup.sh
drwxr-xr-x 7 pi pi  4096 Apr  2 01:11 scriptmodules
drwxr-xr-x 3 pi pi  4096 Mar 19 19:04 tmp
drwxr-xr-x 3 pi pi  4096 Nov  5 21:01 tools

./.git:
total 80
drwxr-xr-x 8 pi pi  4096 Apr  2 01:09 .
drwxr-xr-x 8 pi pi  4096 Apr  2 01:00 ..
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 branches
-rwxr--r-- 1 pi pi   271 Nov  5 21:01 config
-rw-r--r-- 1 pi pi    73 Nov  5 21:01 description
-rw-r--r-- 1 pi pi   228 Apr  2 01:09 FETCH_HEAD
-rw-r--r-- 1 pi pi    23 Nov  5 21:01 HEAD
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 hooks
-rw-r--r-- 1 pi pi 23704 Apr  2 01:08 index
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 info
drwxr-xr-x 3 pi pi  4096 Nov  5 21:01 logs
drwxr-xr-x 4 pi pi  4096 Nov  5 21:01 objects
-rw-r--r-- 1 pi pi    41 Apr  2 00:49 ORIG_HEAD
-rw-r--r-- 1 pi pi  1533 Nov  5 21:01 packed-refs
drwxr-xr-x 5 pi pi  4096 Nov  5 21:01 refs

./.git/branches:
total 8
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:09 ..

./.git/hooks:
total 48
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:09 ..
-rwxr-xr-x 1 pi pi  452 Nov  5 21:01 applypatch-msg.sample
-rwxr-xr-x 1 pi pi  896 Nov  5 21:01 commit-msg.sample
-rwxr-xr-x 1 pi pi  189 Nov  5 21:01 post-update.sample
-rwxr-xr-x 1 pi pi  398 Nov  5 21:01 pre-applypatch.sample
-rwxr-xr-x 1 pi pi 1642 Nov  5 21:01 pre-commit.sample
-rwxr-xr-x 1 pi pi 1239 Nov  5 21:01 prepare-commit-msg.sample
-rwxr-xr-x 1 pi pi 1352 Nov  5 21:01 pre-push.sample
-rwxr-xr-x 1 pi pi 4898 Nov  5 21:01 pre-rebase.sample
-rwxr-xr-x 1 pi pi 3611 Nov  5 21:01 update.sample

./.git/info:
total 12
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:09 ..
-rw-r--r-- 1 pi pi  240 Nov  5 21:01 exclude

./.git/logs:
total 16
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:09 ..
-rw-r--r-- 1 pi pi  181 Nov  5 21:01 HEAD
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 refs

./.git/logs/refs:
total 16
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 ..
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 heads
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 remotes

./.git/logs/refs/heads:
total 12
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi  181 Nov  5 21:01 master

./.git/logs/refs/remotes:
total 12
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 ..
drwxr-xr-x 2 pi pi 4096 Apr  2 00:49 origin

./.git/logs/refs/remotes/origin:
total 16
drwxr-xr-x 2 pi pi 4096 Apr  2 00:49 .
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi  181 Nov  5 21:01 HEAD
-rw-r--r-- 1 pi pi  142 Apr  2 00:49 master

./.git/objects:
total 16
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:09 ..
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 info
drwxr-xr-x 2 pi pi 4096 Apr  2 00:49 pack

./.git/objects/info:
total 8
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 ..

./.git/objects/pack:
total 42008
drwxr-xr-x 2 pi pi     4096 Apr  2 00:49 .
drwxr-xr-x 4 pi pi     4096 Nov  5 21:01 ..
-r--r--r-- 1 pi pi   597052 Nov  5 21:01 pack-34c2fe3a60cbaffd860cff67f66232938a06611d.idx
-r--r--r-- 1 pi pi 20201544 Nov  5 21:01 pack-34c2fe3a60cbaffd860cff67f66232938a06611d.pack
-r--r--r-- 1 pi pi    86136 Apr  2 00:49 pack-38e49c1f4d6dfdd0deb0f39e5ef1aee5ba15ee88.idx
-r--r--r-- 1 pi pi   760967 Apr  2 00:49 pack-38e49c1f4d6dfdd0deb0f39e5ef1aee5ba15ee88.pack
-r--r--r-- 1 pi pi   673100 Mar 19 18:48 pack-5f86ffee342d9ae9988f432cce7e17fb63b6859f.idx
-r--r--r-- 1 pi pi 20676501 Mar 19 18:48 pack-5f86ffee342d9ae9988f432cce7e17fb63b6859f.pack

./.git/refs:
total 20
drwxr-xr-x 5 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:09 ..
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 heads
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 remotes
drwxr-xr-x 2 pi pi 4096 Apr  2 00:49 tags

./.git/refs/heads:
total 12
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 5 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi   41 Nov  5 21:01 master

./.git/refs/remotes:
total 12
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 5 pi pi 4096 Nov  5 21:01 ..
drwxr-xr-x 2 pi pi 4096 Apr  2 00:49 origin

./.git/refs/remotes/origin:
total 16
drwxr-xr-x 2 pi pi 4096 Apr  2 00:49 .
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi   32 Nov  5 21:01 HEAD
-rw-r--r-- 1 pi pi   41 Apr  2 00:49 master

./.git/refs/tags:
total 16
drwxr-xr-x 2 pi pi 4096 Apr  2 00:49 .
drwxr-xr-x 5 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi   41 Apr  2 00:49 4.1
-rw-r--r-- 1 pi pi   41 Apr  2 00:49 4.2

./.github:
total 12
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:00 ..
-rw-r--r-- 1 pi pi  434 Nov  5 21:01 ISSUE_TEMPLATE.md

./logs:
total 56
drwxr-xr-x 2 pi pi 4096 Apr  2 01:05 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:00 ..
-rw-r--r-- 1 pi pi  145 Feb 19 04:00 rps_2017-02-19_040023.log.gz
-rw-r--r-- 1 pi pi 1271 Feb 19 22:29 rps_2017-02-19_222506.log.gz
-rw-r--r-- 1 pi pi 1716 Feb 19 22:53 rps_2017-02-19_224052.log.gz
-rw-r--r-- 1 pi pi 2698 Feb 20 00:07 rps_2017-02-19_225405.log.gz
-rw-r--r-- 1 pi pi 1694 Feb 20 00:45 rps_2017-02-20_001047.log.gz
-rw-r--r-- 1 pi pi 1255 Feb 20 00:56 rps_2017-02-20_004600.log.gz
-rw-r--r-- 1 pi pi 4281 Feb 20 01:11 rps_2017-02-20_005936.log.gz
-rw-r--r-- 1 pi pi  947 Feb 21 07:26 rps_2017-02-21_072604.log.gz
-rw-r--r-- 1 pi pi  145 Mar  3 16:22 rps_2017-03-03_162242.log.gz
-rw-r--r-- 1 pi pi    0 Mar  3 16:23 rps_2017-03-03_162303.log.gz
-rw-r--r-- 1 pi pi  159 Mar 23 05:58 rps_2017-03-23_055815.log.gz
-rw-r--r-- 1 pi pi  143 Apr  2 01:05 rps_2017-04-02_010544.log.gz
-rw-r--r-- 1 pi pi    0 Apr  2 01:05 rps_2017-04-02_010557.log.gz

./scriptmodules:
total 108
drwxr-xr-x  7 pi pi  4096 Apr  2 01:11 .
drwxr-xr-x  8 pi pi  4096 Apr  2 01:00 ..
drwxr-xr-x  2 pi pi  4096 Apr  2 01:10 admin
-rw-r--r--  1 pi pi  1836 Mar 19 18:48 archivefuncs.sh.old
drwxr-xr-x 10 pi pi  4096 Apr  2 01:12 emulators
-rw-r--r--  1 pi pi 40947 Nov  5 21:01 helpers.sh
-rw-r--r--  1 pi pi  7474 Nov  5 21:01 inifuncs.sh
drwxr-xr-x  4 pi pi  4096 Nov  5 21:01 libretrocores
-rw-r--r--  1 pi pi 13410 Nov  5 21:01 packages.sh
drwxr-xr-x  3 pi pi  4096 Nov  5 21:01 ports
drwxr-xr-x  8 pi pi  4096 Nov  5 21:01 supplementary
-rw-r--r--  1 pi pi  8286 Nov  5 21:01 system.sh

./scriptmodules/admin:
total 52
drwxr-xr-x 2 pi pi  4096 Apr  2 01:10 .
drwxr-xr-x 7 pi pi  4096 Apr  2 01:11 ..
-rw-r--r-- 1 pi pi  1571 Mar 19 18:48 apidocs.sh.old
-rw-r--r-- 1 pi pi  1542 Nov  5 21:01 builder.sh
-rw-r--r-- 1 pi pi  1353 Nov  5 21:01 docs.sh
-rw-r--r-- 1 pi pi  6195 Nov  5 21:01 image.sh
-rw-r--r-- 1 pi pi 20166 Nov  5 21:01 setup.sh
-rw-r--r-- 1 pi pi  1218 Mar 19 18:48 wikidocs.sh.old

./scriptmodules/emulators:
total 288
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 .
drwxr-xr-x  7 pi pi 4096 Apr  2 01:11 ..
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 advmame
-rw-r--r--  1 pi pi 1612 Mar 19 18:48 advmame-0.94.sh.old
-rw-r--r--  1 pi pi 2247 Mar 19 18:48 advmame-1.4.sh.old
-rw-r--r--  1 pi pi 8790 Nov  5 21:01 advmame.sh
-rw-r--r--  1 pi pi 1492 Nov  5 21:01 ags.sh
-rw-r--r--  1 pi pi 1238 Mar 19 18:48 amiberry.sh
-rw-r--r--  1 pi pi 3227 Nov  5 21:01 atari800.sh
-rw-r--r--  1 pi pi 1769 Nov  5 21:01 basilisk.sh
-rw-r--r--  1 pi pi 1296 Nov  5 21:01 capricerpi.sh
-rw-r--r--  1 pi pi  982 Nov  5 21:01 coolcv.sh
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 daphne
-rw-r--r--  1 pi pi 2015 Nov  5 21:01 daphne.sh
-rw-r--r--  1 pi pi 3413 Nov  5 21:01 dgen.sh
-rw-r--r--  1 pi pi 2161 Nov  5 21:01 dolphin.sh
-rw-r--r--  1 pi pi 2560 Nov  5 21:01 dosbox.sh
-rw-r--r--  1 pi pi 1370 Mar 19 18:48 drastic.sh
-rw-r--r--  1 pi pi 1520 Nov  5 21:01 fbzx.sh
-rw-r--r--  1 pi pi 1661 Nov  5 21:01 frotz.sh
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 fs-uae
-rw-r--r--  1 pi pi 1936 Nov  5 21:01 fs-uae.sh
-rw-r--r--  1 pi pi 2432 Nov  5 21:01 fuse.sh
-rw-r--r--  1 pi pi 1988 Nov  5 21:01 gngeopi.sh
-rw-r--r--  1 pi pi 1537 Nov  5 21:01 gpsp.sh
-rw-r--r--  1 pi pi 3340 Nov  5 21:01 hatari.sh
-rw-r--r--  1 pi pi 1601 Nov  5 21:01 jzintv.sh
-rw-r--r--  1 pi pi 1574 Nov  5 21:01 linapple.sh
-rw-r--r--  1 pi pi 2758 Nov  5 21:01 mame4all.sh
-rw-r--r--  1 pi pi 1407 Mar 19 18:48 minivmac.sh
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 mupen64plus
-rw-r--r--  1 pi pi 9111 Nov  5 21:01 mupen64plus.sh
-rw-r--r--  1 pi pi 1875 Mar 19 18:48 np2pi.sh
-rw-r--r--  1 pi pi 1452 Nov  5 21:01 openmsx.sh
-rw-r--r--  1 pi pi 1867 Nov  5 21:01 oricutron.sh
-rw-r--r--  1 pi pi 1306 Nov  5 21:01 osmose.sh
-rw-r--r--  1 pi pi  912 Nov  5 21:01 pcsx2.sh
-rw-r--r--  1 pi pi 2168 Nov  5 21:01 pcsx-rearmed.sh
-rw-r--r--  1 pi pi 1936 Nov  5 21:01 pifba.sh
-rw-r--r--  1 pi pi 1456 Nov  5 21:01 pisnes.sh
-rw-r--r--  1 pi pi 3504 Nov  5 21:01 ppsspp.sh
-rw-r--r--  1 pi pi 1506 Nov  5 21:01 px68k.sh
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 quasi88
-rw-r--r--  1 pi pi 1607 Mar 19 18:48 quasi88.sh
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 reicast
-rw-r--r--  1 pi pi 4131 Nov  5 21:01 reicast.sh
-rw-r--r--  1 pi pi 2743 Nov  5 21:01 residualvm.sh
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 retroarch
-rw-r--r--  1 pi pi 9888 Nov  5 21:01 retroarch.sh
-rw-r--r--  1 pi pi 1394 Nov  5 21:01 rpix86.sh
-rw-r--r--  1 pi pi 3287 Nov  5 21:01 scummvm.sh
-rw-r--r--  1 pi pi 1950 Nov  5 21:01 sdltrs.sh
-rw-r--r--  1 pi pi 1376 Nov  5 21:01 simcoupe.sh
-rw-r--r--  1 pi pi 1299 Nov  5 21:01 snes9x.sh
-rw-r--r--  1 pi pi 1073 Nov  5 21:01 stella.sh
-rw-r--r--  1 pi pi 1366 Nov  5 21:01 stratagus.sh
-rw-r--r--  1 pi pi 1249 Nov  5 21:01 ti99sim.sh
-rw-r--r--  1 pi pi 4456 Nov  5 21:01 uae4all.sh
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 uae4arm
-rw-r--r--  1 pi pi 2123 Nov  5 21:01 uae4arm.sh
-rw-r--r--  1 pi pi 3045 Nov  5 21:01 vice.sh
-rw-r--r--  1 pi pi 2290 Mar 19 18:48 xm7.sh
-rw-r--r--  1 pi pi 1971 Nov  5 21:01 xroar.sh
-rw-r--r--  1 pi pi 2784 Nov  5 21:01 zesarux.sh

./scriptmodules/emulators/advmame:
total 12
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rw-r--r--  1 pi pi 3628 Mar 19 18:48 01_rpi_framebuffer.diff

./scriptmodules/emulators/daphne:
total 12
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rw-r--r--  1 pi pi 1023 Nov  5 21:01 dapinput.ini

./scriptmodules/emulators/fs-uae:
total 12
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rwxr-xr-x  1 pi pi 1257 Mar 19 18:48 fs-uae.sh

./scriptmodules/emulators/mupen64plus:
total 20
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rwxr-xr-x  1 pi pi 9777 Nov  5 21:01 mupen64plus.sh

./scriptmodules/emulators/quasi88:
total 12
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rw-r--r--  1 pi pi  879 Mar 19 18:48 01_fixes.diff

./scriptmodules/emulators/reicast:
total 12
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rwxr-xr-x  1 pi pi 3391 Nov  5 21:01 reicast.sh

./scriptmodules/emulators/retroarch:
total 16
drwxr-xr-x  2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rw-r--r--  1 pi pi 1243 Nov  5 21:01 01_hotkey_hack.diff
-rw-r--r--  1 pi pi  499 Nov  5 21:01 02_disable_search.diff

./scriptmodules/emulators/uae4arm:
total 12
drwxr-xr-x  2 pi pi 4096 Mar 19 18:48 .
drwxr-xr-x 10 pi pi 4096 Apr  2 01:12 ..
-rwxr-xr-x  1 pi pi 1578 Mar 19 18:48 uae4arm.sh

./scriptmodules/libretrocores:
total 264
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 7 pi pi 4096 Apr  2 01:11 ..
-rw-r--r-- 1 pi pi 1077 Nov  5 21:01 lr-4do.sh
-rw-r--r-- 1 pi pi 1159 Nov  5 21:01 lr-armsnes.sh
-rw-r--r-- 1 pi pi 1228 Nov  5 21:01 lr-beetle-lynx.sh
-rw-r--r-- 1 pi pi 1471 Nov  5 21:01 lr-beetle-ngp.sh
-rw-r--r-- 1 pi pi 1439 Nov  5 21:01 lr-beetle-pce-fast.sh
-rw-r--r-- 1 pi pi 1136 Nov  5 21:01 lr-beetle-pcfx.sh
-rw-r--r-- 1 pi pi 1281 Nov  5 21:01 lr-beetle-psx.sh
-rw-r--r-- 1 pi pi 1386 Mar 19 18:48 lr-beetle-saturn.sh
-rw-r--r-- 1 pi pi 1427 Nov  5 21:01 lr-beetle-supergrafx.sh
-rw-r--r-- 1 pi pi 1308 Nov  5 21:01 lr-beetle-vb.sh
-rw-r--r-- 1 pi pi 1545 Nov  5 21:01 lr-beetle-wswan.sh
-rw-r--r-- 1 pi pi 1432 Nov  5 21:01 lr-bluemsx.sh
-rw-r--r-- 1 pi pi 1154 Nov  5 21:01 lr-bsnes.sh
-rw-r--r-- 1 pi pi 1258 Nov  5 21:01 lr-caprice32.sh
-rw-r--r-- 1 pi pi 1205 Nov  5 21:01 lr-desmume.sh
-rw-r--r-- 1 pi pi 1700 Nov  5 21:01 lr-dinothawr.sh
-rw-r--r-- 1 pi pi 2083 Nov  5 21:01 lr-fbalpha2012.sh
-rw-r--r-- 1 pi pi 2075 Nov  5 21:01 lr-fbalpha.sh
-rw-r--r-- 1 pi pi 1454 Nov  5 21:01 lr-fceumm.sh
-rw-r--r-- 1 pi pi 1740 Nov  5 21:01 lr-fmsx.sh
-rw-r--r-- 1 pi pi 1296 Nov  5 21:01 lr-fuse.sh
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 lr-gambatte
-rw-r--r-- 1 pi pi 1607 Nov  5 21:01 lr-gambatte.sh
-rw-r--r-- 1 pi pi 1783 Nov  5 21:01 lr-genesis-plus-gx.sh
-rw-r--r-- 1 pi pi 1245 Nov  5 21:01 lr-glupen64.sh
-rw-r--r-- 1 pi pi 1274 Nov  5 21:01 lr-gpsp.sh
-rw-r--r-- 1 pi pi 1146 Nov  5 21:01 lr-gw.sh
-rw-r--r-- 1 pi pi 1101 Nov  5 21:01 lr-handy.sh
drwxr-xr-x 2 pi pi 4096 Mar 19 18:48 lr-hatari
-rw-r--r-- 1 pi pi 1761 Nov  5 21:01 lr-hatari.sh
-rw-r--r-- 1 pi pi 1417 Nov  5 21:01 lr-imame4all.sh
-rw-r--r-- 1 pi pi 2043 Nov  5 21:01 lr-mame2003.sh
-rw-r--r-- 1 pi pi 1539 Nov  5 21:01 lr-mame2010.sh
-rw-r--r-- 1 pi pi 1338 Nov  5 21:01 lr-mame2014.sh
-rw-r--r-- 1 pi pi 1458 Mar 19 18:48 lr-mame2016.sh
-rw-r--r-- 1 pi pi 1344 Nov  5 21:01 lr-mame.sh
-rw-r--r-- 1 pi pi 1178 Mar 19 18:48 lr-mess2016.sh
-rw-r--r-- 1 pi pi 1845 Nov  5 21:01 lr-mess.sh
-rw-r--r-- 1 pi pi 1370 Nov  5 21:01 lr-mgba.sh
-rw-r--r-- 1 pi pi 1328 Mar 19 18:48 lr-mrboom.sh
-rw-r--r-- 1 pi pi 3322 Nov  5 21:01 lr-mupen64plus.sh
-rw-r--r-- 1 pi pi 1547 Nov  5 21:01 lr-nestopia.sh
-rw-r--r-- 1 pi pi 1512 Nov  5 21:01 lr-nxengine.sh
-rw-r--r-- 1 pi pi 1150 Nov  5 21:01 lr-o2em.sh
-rw-r--r-- 1 pi pi 3499 Mar 19 18:48 lr-parallel-n64.sh
-rw-r--r-- 1 pi pi 1410 Nov  5 21:01 lr-pcsx-rearmed.sh
-rw-r--r-- 1 pi pi 2174 Nov  5 21:01 lr-picodrive.sh
-rw-r--r-- 1 pi pi 1986 Nov  5 21:01 lr-ppsspp.sh
-rw-r--r-- 1 pi pi 1573 Nov  5 21:01 lr-prboom.sh
-rw-r--r-- 1 pi pi 1327 Nov  5 21:01 lr-prosystem.sh
-rw-r--r-- 1 pi pi 1113 Mar 19 18:48 lr-puae.sh
-rw-r--r-- 1 pi pi 1068 Nov  5 21:01 lr-quicknes.sh
-rw-r--r-- 1 pi pi 1439 Nov  5 21:01 lr-reicast.sh
-rw-r--r-- 1 pi pi 1438 Nov  5 21:01 lr-snes9x2002.sh
-rw-r--r-- 1 pi pi 1300 Nov  5 21:01 lr-snes9x2005.sh
-rw-r--r-- 1 pi pi 1521 Nov  5 21:01 lr-snes9x2010.sh
-rw-r--r-- 1 pi pi 1498 Mar 19 18:48 lr-snes9x.sh
-rw-r--r-- 1 pi pi 1125 Nov  5 21:01 lr-stella.sh
-rw-r--r-- 1 pi pi 1332 Nov  5 21:01 lr-tgbdual.sh
-rw-r--r-- 1 pi pi 2418 Nov  5 21:01 lr-tyrquake.sh
-rw-r--r-- 1 pi pi 1351 Nov  5 21:01 lr-vba-next.sh
-rw-r--r-- 1 pi pi 1313 Nov  5 21:01 lr-vecx.sh
-rw-r--r-- 1 pi pi 1230 Nov  5 21:01 lr-virtualjaguar.sh
-rw-r--r-- 1 pi pi 1486 Nov  5 21:01 lr-yabause.sh

./scriptmodules/libretrocores/lr-gambatte:
total 12
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi  263 Nov  5 21:01 default.pal

./scriptmodules/libretrocores/lr-hatari:
total 12
drwxr-xr-x 2 pi pi 4096 Mar 19 18:48 .
drwxr-xr-x 4 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi 3710 Mar 19 18:48 01_libcapsimage.diff

./scriptmodules/ports:
total 132
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 7 pi pi 4096 Apr  2 01:11 ..
-rw-r--r-- 1 pi pi 3176 Nov  5 21:01 alephone.sh
-rw-r--r-- 1 pi pi 2335 Nov  5 21:01 cannonball.sh
-rw-r--r-- 1 pi pi 1577 Nov  5 21:01 cgenius.sh
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 darkplaces-quake
-rw-r--r-- 1 pi pi 1593 Nov  5 21:01 darkplaces-quake.sh
-rw-r--r-- 1 pi pi 4503 Nov  5 21:01 dxx-rebirth.sh
-rw-r--r-- 1 pi pi 2255 Nov  5 21:01 eduke32.sh
-rw-r--r-- 1 pi pi 3990 Nov  5 21:01 gemrb.sh
-rw-r--r-- 1 pi pi  989 Nov  5 21:01 giana.sh
-rw-r--r-- 1 pi pi 1845 Nov  5 21:01 kodi.sh
-rw-r--r-- 1 pi pi 1183 Nov  5 21:01 lincity-ng.sh
-rw-r--r-- 1 pi pi 2026 Nov  5 21:01 love.sh
-rw-r--r-- 1 pi pi 1189 Nov  5 21:01 micropolis.sh
-rw-r--r-- 1 pi pi 1059 Nov  5 21:01 minecraft.sh
-rw-r--r-- 1 pi pi 1868 Nov  5 21:01 moonlight.sh
-rw-r--r-- 1 pi pi 1329 Mar 19 18:48 openblok.sh
-rw-r--r-- 1 pi pi 2523 Nov  5 21:01 openbor.sh
-rw-r--r-- 1 pi pi 1524 Nov  5 21:01 openpht.sh
-rw-r--r-- 1 pi pi 1146 Nov  5 21:01 openttd.sh
-rw-r--r-- 1 pi pi 1821 Nov  5 21:01 opentyrian.sh
-rw-r--r-- 1 pi pi 1727 Nov  5 21:01 quake3.sh
-rw-r--r-- 1 pi pi 1572 Nov  5 21:01 sdlpop.sh
-rw-r--r-- 1 pi pi 1017 Nov  5 21:01 smw.sh
-rw-r--r-- 1 pi pi 2670 Nov  5 21:01 solarus.sh
-rw-r--r-- 1 pi pi  867 Nov  5 21:01 supertux.sh
-rw-r--r-- 1 pi pi 1498 Nov  5 21:01 tyrquake.sh
-rw-r--r-- 1 pi pi 2108 Nov  5 21:01 uqm.sh
-rw-r--r-- 1 pi pi 2941 Nov  5 21:01 wolf4sdl.sh
-rw-r--r-- 1 pi pi 1016 Nov  5 21:01 xrick.sh
-rw-r--r-- 1 pi pi 1608 Nov  5 21:01 zdoom.sh

./scriptmodules/ports/darkplaces-quake:
total 16
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi 4435 Nov  5 21:01 rpi.diff

./scriptmodules/supplementary:
total 300
drwxr-xr-x 8 pi pi  4096 Nov  5 21:01 .
drwxr-xr-x 7 pi pi  4096 Apr  2 01:11 ..
-rw-r--r-- 1 pi pi  6106 Mar 19 18:48 attractmode.sh
-rw-r--r-- 1 pi pi  1863 Nov  5 21:01 audiosettings.sh
-rw-r--r-- 1 pi pi  6041 Nov  5 21:01 autostart.sh
-rw-r--r-- 1 pi pi  5047 Nov  5 21:01 bashwelcometweak.sh
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 bluetooth
-rw-r--r-- 1 pi pi 13923 Nov  5 21:01 bluetooth.sh
-rw-r--r-- 1 pi pi 18753 Nov  5 21:01 configedit.sh
-rw-r--r-- 1 pi pi  1888 Mar 19 18:48 controlblock.sh
-rw-r--r-- 1 pi pi  1934 Nov  5 21:01 dispmanx.sh
drwxr-xr-x 3 pi pi  4096 Nov  5 21:01 emulationstation
-rw-r--r-- 1 pi pi  1131 Nov  5 21:01 emulationstation-kids.sh
-rw-r--r-- 1 pi pi  7432 Nov  5 21:01 emulationstation.sh
-rw-r--r-- 1 pi pi  5879 Nov  5 21:01 esthemes.sh
-rw-r--r-- 1 pi pi  6188 Nov  5 21:01 gamecondriver.sh
-rw-r--r-- 1 pi pi  1307 Mar 19 18:48 golang.sh
-rw-r--r-- 1 pi pi 13963 Mar 19 18:48 launchingimages.sh
-rw-r--r-- 1 pi pi  4542 Nov  5 21:01 limelight.sh
-rw-r--r-- 1 pi pi  3925 Mar 19 18:48 mehstation.sh
-rw-r--r-- 1 pi pi  2148 Nov  5 21:01 mkarcadejoystick.sh
-rw-r--r-- 1 pi pi  1146 Nov  5 21:01 mobilegamepad.sh
-rw-r--r-- 1 pi pi  1852 Mar 19 18:48 powerblock.sh
-rw-r--r-- 1 pi pi  4483 Nov  5 21:01 ps3controller.sh
-rw-r--r-- 1 pi pi  3860 Nov  5 21:01 raspbiantools.sh
-rw-r--r-- 1 pi pi   792 Nov  5 21:01 resetromdirs.sh
-rw-r--r-- 1 pi pi  4640 Nov  5 21:01 retronetplay.sh
-rw-r--r-- 1 pi pi  4188 Nov  5 21:01 retropie-manager.sh
drwxr-xr-x 3 pi pi  4096 Nov  5 21:01 retropiemenu
-rw-r--r-- 1 pi pi  3602 Nov  5 21:01 retropiemenu.sh
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 runcommand
-rw-r--r-- 1 pi pi  4108 Nov  5 21:01 runcommand.sh
-rw-r--r-- 1 pi pi  2857 Nov  5 21:01 samba.sh
-rw-r--r-- 1 pi pi  8120 Nov  5 21:01 scraper.sh
-rw-r--r-- 1 pi pi  2912 Nov  5 21:01 sdl1.sh
-rw-r--r-- 1 pi pi  2935 Nov  5 21:01 sdl2.sh
-rw-r--r-- 1 pi pi  4427 Nov  5 21:01 snesdev.sh
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 splashscreen
-rw-r--r-- 1 pi pi 10234 Nov  5 21:01 splashscreen.sh
-rw-r--r-- 1 pi pi  2853 Nov  5 21:01 steamcontroller.sh
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 usbromservice
-rw-r--r-- 1 pi pi  3183 Nov  5 21:01 usbromservice.sh
-rw-r--r-- 1 pi pi  1962 Nov  5 21:01 virtualgamepad.sh
-rw-r--r-- 1 pi pi  6274 Nov  5 21:01 wifi.sh
-rw-r--r-- 1 pi pi  2925 Nov  5 21:01 wikiview.sh
-rw-r--r-- 1 pi pi  1661 Nov  5 21:01 xarcade2jstick.sh
-rw-r--r-- 1 pi pi  5467 Nov  5 21:01 xboxdrv.sh
-rw-r--r-- 1 pi pi  2682 Nov  5 21:01 xpad.sh

./scriptmodules/supplementary/bluetooth:
total 52
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi  4096 Nov  5 21:01 ..
-rwxr-xr-x 1 pi pi  4885 Nov  5 21:01 bluez-simple-agent
-rwxr-xr-x 1 pi pi  5359 Nov  5 21:01 bluez-test-device
-rw-r--r-- 1 pi pi  1567 Nov  5 21:01 bluezutils.py
-rw-r--r-- 1 pi pi 18006 Nov  5 21:01 COPYING
-rw-r--r-- 1 pi pi    88 Nov  5 21:01 readme.txt

./scriptmodules/supplementary/emulationstation:
total 56
drwxr-xr-x 3 pi pi  4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi  4096 Nov  5 21:01 ..
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 configscripts
-rwxr-xr-x 1 pi pi  8011 Nov  5 21:01 inputconfiguration.sh
-rw-r--r-- 1 pi pi 35043 Nov  5 21:01 retropie.svg

./scriptmodules/supplementary/emulationstation/configscripts:
total 56
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 .
drwxr-xr-x 3 pi pi  4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi  5586 Mar 19 18:48 daphne.sh
-rw-r--r-- 1 pi pi  3464 Nov  5 21:01 emulationstation.sh
-rw-r--r-- 1 pi pi  7889 Nov  5 21:01 mupen64plus.sh
-rw-r--r-- 1 pi pi  3332 Nov  5 21:01 pifba.sh
-rw-r--r-- 1 pi pi  1494 Nov  5 21:01 pisnes.sh
-rw-r--r-- 1 pi pi  6892 Nov  5 21:01 reicast.sh
-rw-r--r-- 1 pi pi 11555 Nov  5 21:01 retroarch.sh

./scriptmodules/supplementary/retropiemenu:
total 16
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi 4017 Nov  5 21:01 gamelist.xml
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 icons

./scriptmodules/supplementary/retropiemenu/icons:
total 1380
drwxr-xr-x 2 pi pi   4096 Nov  5 21:01 .
drwxr-xr-x 3 pi pi   4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi 190458 Nov  5 21:01 audiosettings.png
-rw-r--r-- 1 pi pi 156095 Nov  5 21:01 bluetooth.png
-rw-r--r-- 1 pi pi  83077 Nov  5 21:01 configedit.png
-rw-r--r-- 1 pi pi 126473 Nov  5 21:01 esthemes.png
-rw-r--r-- 1 pi pi  35841 Nov  5 21:01 filemanager.png
-rw-r--r-- 1 pi pi 144257 Nov  5 21:01 raspiconfig.png
-rw-r--r-- 1 pi pi  74993 Nov  5 21:01 retroarch.png
-rw-r--r-- 1 pi pi 129910 Nov  5 21:01 retronetplay.png
-rw-r--r-- 1 pi pi  79485 Nov  5 21:01 rpsetup.png
-rw-r--r-- 1 pi pi  36897 Nov  5 21:01 runcommand.png
-rw-r--r-- 1 pi pi  76493 Nov  5 21:01 showip.png
-rw-r--r-- 1 pi pi 190359 Nov  5 21:01 splashscreen.png
-rw-r--r-- 1 pi pi  52860 Nov  5 21:01 wifi.png

./scriptmodules/supplementary/runcommand:
total 40
drwxr-xr-x 2 pi pi  4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi  4096 Nov  5 21:01 ..
-rwxr-xr-x 1 pi pi  2726 Nov  5 21:01 joy2key.py
-rwxr-xr-x 1 pi pi 26111 Nov  5 21:01 runcommand.sh

./scriptmodules/supplementary/splashscreen:
total 12
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Nov  5 21:01 ..
-rwxr-xr-x 1 pi pi 2160 Nov  5 21:01 asplashscreen

./scriptmodules/supplementary/usbromservice:
total 16
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Nov  5 21:01 ..
-rw-r--r-- 1 pi pi 2737 Nov  5 21:01 01_retropie_copyroms
-rw-r--r-- 1 pi pi 1397 Mar 19 18:48 10_retropie_mount

./tmp:
total 12
drwxr-xr-x 3 pi pi 4096 Mar 19 19:04 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:00 ..
drwxr-xr-x 2 pi pi 4096 Mar 19 19:15 build

./tmp/build:
total 8
drwxr-xr-x 2 pi pi 4096 Mar 19 19:15 .
drwxr-xr-x 3 pi pi 4096 Mar 19 19:04 ..

./tools:
total 16
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 8 pi pi 4096 Apr  2 01:00 ..
-rwxr-xr-x 1 pi pi   50 Nov  5 21:01 createMovieFromImages.sh
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 sdcard

./tools/sdcard:
total 24
drwxr-xr-x 2 pi pi 4096 Nov  5 21:01 .
drwxr-xr-x 3 pi pi 4096 Nov  5 21:01 ..
-rwxr-xr-x 1 pi pi  936 Nov  5 21:01 chroot.sh
-rwxr-xr-x 1 pi pi  807 Nov  5 21:01 flashsync.sh
-rwxr-xr-x 1 pi pi  407 Nov  5 21:01 mount.sh
-rw-r--r-- 1 pi pi  956 Nov  5 21:01 readme.txt
pi@retropie:~/RetroPie-Setup $ git stash
No local changes to save
joolswills commented 7 years ago

Please use the RetroPie forum for support. Looks like you just added or modified some scripts that are part of retropie-setup. git reset --hard; git clean -f -d should sort it if run from the RetroPie-setup dir. It will wipe any customisations to the code