aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Grebowiec <njgreb@gmail.com>2013-03-15 14:39:16 -0500
committerNathan Grebowiec <njgreb@gmail.com>2013-03-20 12:37:22 -0500
commit95eedbbd57c13f1b08c9c2ab1807f06f62867018 (patch)
tree15a1581c92845a6293671d80e7f1261829b6faf5
parent032a351d08b405e980dcfd620a225a44f9fb6b8d (diff)
downloadbootable_recovery-95eedbbd57c13f1b08c9c2ab1807f06f62867018.zip
bootable_recovery-95eedbbd57c13f1b08c9c2ab1807f06f62867018.tar.gz
bootable_recovery-95eedbbd57c13f1b08c9c2ab1807f06f62867018.tar.bz2
Store CWM Recovery Version and Device
Patchset 1) Initial commit Patchset 2) moved fclose() Patchset 3) move to one file Patchset 4) removed unneeded variable Patchset 5) fixed version Patchset 6) rebase Change-Id: I2f958f6085d6a8fac303b9b013e2be955fb42780
-rw-r--r--Android.mk2
-rw-r--r--extendedcommands.c12
2 files changed, 9 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 0431f21..c7bfe62 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,7 +58,7 @@ BOARD_RECOVERY_CHAR_HEIGHT := $(shell echo $(BOARD_USE_CUSTOM_RECOVERY_FONT) | c
LOCAL_CFLAGS += -DBOARD_RECOVERY_CHAR_WIDTH=$(BOARD_RECOVERY_CHAR_WIDTH) -DBOARD_RECOVERY_CHAR_HEIGHT=$(BOARD_RECOVERY_CHAR_HEIGHT)
-BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT BOARD_TOUCH_RECOVERY RECOVERY_EXTEND_NANDROID_MENU TARGET_USE_CUSTOM_LUN_FILE_PATH
+BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT BOARD_TOUCH_RECOVERY RECOVERY_EXTEND_NANDROID_MENU TARGET_USE_CUSTOM_LUN_FILE_PATH TARGET_DEVICE
$(foreach board_define,$(BOARD_RECOVERY_DEFINES), \
$(if $($(board_define)), \
diff --git a/extendedcommands.c b/extendedcommands.c
index a6a4005..f1201e6 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -80,13 +80,17 @@ void write_string_to_file(const char* filename, const char* string) {
sprintf(tmp, "mkdir -p $(dirname %s)", filename);
__system(tmp);
FILE *file = fopen(filename, "w");
- fprintf(file, "%s", string);
- fclose(file);
+ if( file != NULL) {
+ fprintf(file, "%s", string);
+ fclose(file);
+ }
}
void write_recovery_version() {
- write_string_to_file("/sdcard/0/clockworkmod/.recovery_version",EXPAND(RECOVERY_VERSION));
- write_string_to_file("/sdcard/clockworkmod/.recovery_version",EXPAND(RECOVERY_VERSION));
+ if ( is_data_media() ) {
+ write_string_to_file("/sdcard/0/clockworkmod/.recovery_version",EXPAND(RECOVERY_VERSION) "\n" EXPAND(TARGET_DEVICE));
+ }
+ write_string_to_file("/sdcard/clockworkmod/.recovery_version",EXPAND(RECOVERY_VERSION) "\n" EXPAND(TARGET_DEVICE));
}
void